From 36f199b2fa875065839992695f1a094c03eb54cd Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 3 Apr 2016 09:35:35 +0200 Subject: [PATCH] porting cookie.patch to generic --- generic-pc/playback.cpp | 4 ++-- generic-pc/playback.h | 2 +- generic-pc/playback_gst.cpp | 4 ++-- generic-pc/playback_gst.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generic-pc/playback.cpp b/generic-pc/playback.cpp index a605fa2..47d483a 100644 --- a/generic-pc/playback.cpp +++ b/generic-pc/playback.cpp @@ -15,10 +15,10 @@ void cPlayback::Close(void) bool cPlayback::Start(std::string filename, std::string headers) { - Start((char *) filename.c_str(),0,0,0,0,0); + return Start((char*) filename.c_str(),0,0,0,0,0, headers); } -bool cPlayback::Start(char * filename, int vpid, int vtype, int apid, int ac3, int duration) +bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, int, std::string headers) { printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d duration=%i\n", FILENAME, __func__, filename, vpid, vtype, apid, ac3, duration); diff --git a/generic-pc/playback.h b/generic-pc/playback.h index bc6e5bc..4638456 100644 --- a/generic-pc/playback.h +++ b/generic-pc/playback.h @@ -22,7 +22,7 @@ class cPlayback cPlayback(int); bool Open(playmode_t PlayMode); void Close(void); - bool Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration); + 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 SetAPid(int pid, bool ac3); bool SetSubtitlePid(int pid); diff --git a/generic-pc/playback_gst.cpp b/generic-pc/playback_gst.cpp index ccaf086..3bf7321 100644 --- a/generic-pc/playback_gst.cpp +++ b/generic-pc/playback_gst.cpp @@ -350,10 +350,10 @@ void cPlayback::Close(void) // start bool cPlayback::Start(std::string filename, std::string headers) { - Start((char *) filename.c_str(),0,0,0,0,0); + return Start((char*) filename.c_str(),0,0,0,0,0, headers); } -bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/, int /*ac3*/, int /*duration*/) +bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/, int /*ac3*/, int /*duration*/, std::string headers) { lt_info( "%s:%s\n", FILENAME, __FUNCTION__); diff --git a/generic-pc/playback_gst.h b/generic-pc/playback_gst.h index e598554..6d78fa1 100644 --- a/generic-pc/playback_gst.h +++ b/generic-pc/playback_gst.h @@ -55,7 +55,7 @@ class cPlayback cPlayback(int); bool Open(playmode_t PlayMode); void Close(void); - bool Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration); + 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 Play(void); bool SyncAV(void);