mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 23:12:44 +02:00
Merge branch 'master' of https://github.com/TangoCash/libstb-hal-cst-next
Origin commit data
------------------
Branch: master
Commit: fefd97a3b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-10 (Wed, 10 Jan 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -206,6 +206,7 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
|
||||
}
|
||||
}
|
||||
playing = true;
|
||||
first = true;
|
||||
player->output->Command(player, OUTPUT_OPEN, NULL);
|
||||
ret = (player->playback->Command(player, PLAYBACK_PLAY, NULL) == 0);
|
||||
if (ret && !isHTTP)
|
||||
@@ -424,7 +425,7 @@ bool cPlayback::GetPosition(int &position, int &duration)
|
||||
bool cPlayback::SetPosition(int position, bool absolute)
|
||||
{
|
||||
lt_info("%s %d\n", __func__, position);
|
||||
if (!playing)
|
||||
if (playing && first)
|
||||
{
|
||||
/* the calling sequence is:
|
||||
* Start() - paused
|
||||
@@ -433,6 +434,7 @@ bool cPlayback::SetPosition(int position, bool absolute)
|
||||
* so let's remember the initial jump position and later jump to it
|
||||
*/
|
||||
init_jump = position;
|
||||
first = false;
|
||||
return false;
|
||||
}
|
||||
int64_t pos = (position / 1000.0);
|
||||
@@ -682,6 +684,7 @@ cPlayback::cPlayback(int num __attribute__((unused)))
|
||||
lt_info("%s\n", __func__);
|
||||
playing = false;
|
||||
decoders_closed = false;
|
||||
first = false;
|
||||
}
|
||||
|
||||
cPlayback::~cPlayback()
|
||||
|
@@ -18,7 +18,7 @@ class cPlayback
|
||||
|
||||
private:
|
||||
bool enabled;
|
||||
bool playing;
|
||||
bool playing, first;
|
||||
bool no_probe;
|
||||
int nPlaybackSpeed;
|
||||
int mAudioStream;
|
||||
|
Reference in New Issue
Block a user