From 603fba2500ca074ebb12456466a6e9421b8870f7 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 3 Nov 2019 18:30:13 +0100 Subject: [PATCH] playback arm: add option to play szSecondFile (audio) --- libarmbox/playback_libeplayer3.cpp | 15 +++++++++++---- libarmbox/playback_libeplayer3.h | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libarmbox/playback_libeplayer3.cpp b/libarmbox/playback_libeplayer3.cpp index 9394a7f..8b27c3f 100644 --- a/libarmbox/playback_libeplayer3.cpp +++ b/libarmbox/playback_libeplayer3.cpp @@ -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 isHTTP = false; @@ -141,7 +141,14 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in else 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 (pm == PLAYMODE_TS) diff --git a/libarmbox/playback_libeplayer3.h b/libarmbox/playback_libeplayer3.h index 8297a15..2e13905 100644 --- a/libarmbox/playback_libeplayer3.h +++ b/libarmbox/playback_libeplayer3.h @@ -41,8 +41,8 @@ class cPlayback bool Open(playmode_t PlayMode); void Close(void); - bool Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration, std::string headers = ""); - bool Start(std::string filename, 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 = "", std::string filename2 = ""); bool SetAPid(int pid, bool ac3 = false); bool SetVPid(int /*pid*/); bool SetSubtitlePid(int pid);