mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TangoCash/libstb-hal-cst-next

Browse Source 
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:
vanhofen
2018-01-10 23:36:48 +01:00
parent 8c764f8da7 fcdf57713c
commit 382e08f922
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libarmbox/playback_libeplayer3.cpp
View File

@@ -206,6 +206,7 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
} }
} }
playing = true; playing = true;
first = true;
player->output->Command(player, OUTPUT_OPEN, NULL); player->output->Command(player, OUTPUT_OPEN, NULL);
ret = (player->playback->Command(player, PLAYBACK_PLAY, NULL) == 0); ret = (player->playback->Command(player, PLAYBACK_PLAY, NULL) == 0);
if (ret && !isHTTP) if (ret && !isHTTP)
@@ -424,7 +425,7 @@ bool cPlayback::GetPosition(int &position, int &duration)
bool cPlayback::SetPosition(int position, bool absolute) bool cPlayback::SetPosition(int position, bool absolute)
{ {
lt_info("%s %d\n", __func__, position); lt_info("%s %d\n", __func__, position);
if (!playing) if (playing && first)
{ {
/* the calling sequence is: /* the calling sequence is:
* Start() - paused * 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 * so let's remember the initial jump position and later jump to it
*/ */
init_jump = position; init_jump = position;
first = false;
return false; return false;
} }
int64_t pos = (position / 1000.0); int64_t pos = (position / 1000.0);
@@ -682,6 +684,7 @@ cPlayback::cPlayback(int num __attribute__((unused)))
lt_info("%s\n", __func__); lt_info("%s\n", __func__);
playing = false; playing = false;
decoders_closed = false; decoders_closed = false;
first = false;
} }
cPlayback::~cPlayback() cPlayback::~cPlayback()

2
libarmbox/playback_libeplayer3.h
View File

@@ -18,7 +18,7 @@ class cPlayback
private: private:
bool enabled; bool enabled;
bool playing; bool playing, first;
bool no_probe; bool no_probe;
int nPlaybackSpeed; int nPlaybackSpeed;
int mAudioStream; int mAudioStream;