From 69b736f33f7ca6c0b118b6ee820c9f0736020301 Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 19 Jun 2020 23:51:54 +0200 Subject: [PATCH] fix build hd60 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e2d3c57ade501c08ff4ded823bec976a25f50b83 Author: max_10 Date: 2020-06-19 (Fri, 19 Jun 2020) Origin message was: ------------------ - fix build hd60 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/playback_hisilicon.cpp | 6 +++--- libarmbox/playback_hisilicon.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libarmbox/playback_hisilicon.cpp b/libarmbox/playback_hisilicon.cpp index 62c9639..f5d7471 100644 --- a/libarmbox/playback_hisilicon.cpp +++ b/libarmbox/playback_hisilicon.cpp @@ -76,12 +76,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 __attribute__((unused))) { bool ret = false; diff --git a/libarmbox/playback_hisilicon.h b/libarmbox/playback_hisilicon.h index 4103dcd..c5ce392 100644 --- a/libarmbox/playback_hisilicon.h +++ b/libarmbox/playback_hisilicon.h @@ -77,8 +77,8 @@ public: 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);