mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

playback arm: add option to play szSecondFile (audio)

Browse Source
This commit is contained in:
Jacek Jendrzej
2019-11-03 18:30:13 +01:00
parent 639762e1b3
commit 603fba2500
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libarmbox/playback_libeplayer3.cpp
View File

@@ -100,12 +100,12 @@ void cPlayback::Close(void)
} }
} }
bool cPlayback::Start(std::string filename, std::string headers) bool cPlayback::Start(std::string filename, std::string headers, std::string filename2)
{ {
return Start((char *) filename.c_str(), 0, 0, 0, 0, 0, headers); return Start((char *) filename.c_str(), 0, 0, 0, 0, 0, headers,filename2);
} }
bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, int, std::string headers __attribute__((unused))) bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, int, std::string headers __attribute__((unused)),std::string filename2)
{ {
bool ret = false; bool ret = false;
bool isHTTP = false; bool isHTTP = false;
@@ -141,7 +141,14 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
else else
isHTTP = true; isHTTP = true;
PlayFiles_t playbackFiles = { (char *) file.c_str(), NULL, NULL, NULL, 0, 0, 0, 0}; std::string szSecondFile;
char *file2 = NULL;
if(!filename2.empty()){
szSecondFile = filename2;
file2 = (char *) szSecondFile.c_str();
}
PlayFiles_t playbackFiles = { (char *) file.c_str(), file2, NULL, NULL, 0, 0, 0, 0};
if (player->playback->Command(player, PLAYBACK_OPEN, &playbackFiles) == 0) if (player->playback->Command(player, PLAYBACK_OPEN, &playbackFiles) == 0)
{ {
if (pm == PLAYMODE_TS) if (pm == PLAYMODE_TS)

4
libarmbox/playback_libeplayer3.h
View File

@@ -41,8 +41,8 @@ class cPlayback
bool Open(playmode_t PlayMode); bool Open(playmode_t PlayMode);
void Close(void); void Close(void);
bool Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration, std::string headers = ""); bool Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration, std::string headers = "", std::string filename2 = "");
bool Start(std::string filename, std::string headers = ""); bool Start(std::string filename, std::string headers = "", std::string filename2 = "");
bool SetAPid(int pid, bool ac3 = false); bool SetAPid(int pid, bool ac3 = false);
bool SetVPid(int /*pid*/); bool SetVPid(int /*pid*/);
bool SetSubtitlePid(int pid); bool SetSubtitlePid(int pid);