Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Paused at media end singalization #1137

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Paused at media end singalization #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06e167c
defined signals
SmartManDeveloper Sep 5, 2018
2099dee
emit signal mediaEndReached when pausing at the end of media (when Me…
SmartManDeveloper Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/AVDemuxThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ void AVDemuxThread::run()
if (!(mediaEndAction() & MediaEndAction_Pause))
break;
pause(true);
Q_EMIT mediaEndReached();
Q_EMIT requestClockPause(true);
if (aqueue)
aqueue->blockEmpty(true);
Expand Down
1 change: 1 addition & 0 deletions src/AVDemuxThread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class AVDemuxThread : public QThread
void seekFinished(qint64 timestamp);
void stepFinished();
void internalSubtitlePacketRead(int index, const QtAV::Packet& packet);
void mediaEndReached(); // emitted at the end of media if MediaEndAction_Pause is set
private slots:
void seekOnPauseFinished();
void frameDeliveredOnStepForward();
Expand Down
1 change: 1 addition & 0 deletions src/AVPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ AVPlayer::AVPlayer(QObject *parent) :
connect(d->read_thread, SIGNAL(bufferProgressChanged(qreal)), this, SIGNAL(bufferProgressChanged(qreal)));
connect(d->read_thread, SIGNAL(seekFinished(qint64)), this, SLOT(onSeekFinished(qint64)), Qt::DirectConnection);
connect(d->read_thread, SIGNAL(internalSubtitlePacketRead(int, QtAV::Packet)), this, SIGNAL(internalSubtitlePacketRead(int, QtAV::Packet)), Qt::DirectConnection);
connect(d->read_thread, SIGNAL(mediaEndReached()), this, SIGNAL(mediaEndReached()), Qt::DirectConnection);
d->vcapture = new VideoCapture(this);
}

Expand Down
1 change: 1 addition & 0 deletions src/QtAV/AVPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,7 @@ public Q_SLOTS:
*/
void internalSubtitleHeaderRead(const QByteArray& codec, const QByteArray& data);
void internalSubtitlePacketRead(int track, const QtAV::Packet& packet);
void mediaEndReached(); // emitted at the end of media if MediaEndAction_Pause is set
private Q_SLOTS:
void loadInternal(); // simply load
void playInternal(); // simply play
Expand Down