diff --git a/azbox/playback.cpp b/azbox/playback.cpp index 3054b95..09c345d 100644 --- a/azbox/playback.cpp +++ b/azbox/playback.cpp @@ -300,6 +300,11 @@ bool cPlayback::Open(playmode_t PlayMode) return 0; } +bool cPlayback::Start(std::string /*filename*/, std::string /*headers*/) +{ + return false; +} + //Used by Fileplay bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short _apid, int ac3, unsigned int duration) @@ -366,7 +371,7 @@ bool cPlayback::SetAPid(unsigned short pid, int /*ac3*/) return true; } -bool cPlayback::SelectSubtitles(int pid) +bool cPlayback::SelectSubtitles(int pid, std::string /*charset*/) { lt_info("%s: pid %i\n", __func__, pid); if (pid != pd->subpid) diff --git a/generic-pc/playback.cpp b/generic-pc/playback.cpp index cf6c2ac..3914a32 100644 --- a/generic-pc/playback.cpp +++ b/generic-pc/playback.cpp @@ -13,6 +13,11 @@ void cPlayback::Close(void) { } +bool cPlayback::Start(std::string /*filename*/, std::string /*headers*/) +{ + return false; +} + bool cPlayback::Start(char * filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int duration) { printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d duration=%i\n", @@ -26,7 +31,7 @@ bool cPlayback::SetAPid(unsigned short pid, int /*ac3*/) return true; } -bool cPlayback::SelectSubtitles(int pid) +bool cPlayback::SelectSubtitles(int pid, std::string /*charset*/) { printf("%s:%s pid %i\n", FILENAME, __func__, pid); return true; diff --git a/include/playback_hal.h b/include/playback_hal.h index 84d8d37..6aec52a 100644 --- a/include/playback_hal.h +++ b/include/playback_hal.h @@ -41,6 +41,7 @@ public: bool Open(playmode_t PlayMode); void Close(void); bool Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int duration); + bool Start(std::string filename, std::string headers = ""); bool Stop(void); bool SetAPid(unsigned short pid, int audio_flag); bool SetSpeed(int speed); @@ -49,7 +50,7 @@ public: bool SetPosition(int position, bool absolute = false); void FindAllPids(uint16_t *pids, unsigned short *aud_flags, uint16_t *num, std::string *language); void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *num, std::string *language); - bool SelectSubtitles(int pid); + bool SelectSubtitles(int pid, std::string charset = ""); void GetChapters(std::vector &positions, std::vector &titles); void RequestAbort(); void GetTitles(std::vector &playlists, std::vector &titles, int ¤t); diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp index 30c3298..2367bf9 100644 --- a/libspark/playback_libeplayer3.cpp +++ b/libspark/playback_libeplayer3.cpp @@ -105,6 +105,12 @@ void cPlayback::Close(void) } } +/* TODO: implement cookie stuff */ +bool cPlayback::Start(std::string filename, std::string /*headers*/) +{ + return Start((char *)filename.c_str(), 0, 0, 0, 0, 0); +} + bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int) { bool ret = false; @@ -444,7 +450,7 @@ void cPlayback::FindAllSubs(uint16_t * /*pids*/, unsigned short * /*supp*/, uint *num = 0; } -bool cPlayback::SelectSubtitles(int pid) +bool cPlayback::SelectSubtitles(int pid, std::string /*charset*/) { lt_info("%s pid %d\n", __func__, pid); return false; diff --git a/libtriple/playback_td.cpp b/libtriple/playback_td.cpp index 8fadb34..d52ea71 100644 --- a/libtriple/playback_td.cpp +++ b/libtriple/playback_td.cpp @@ -241,6 +241,12 @@ bool cPlayback::Start(char *filename, unsigned short vp, int vtype, unsigned sho return pd->Start(filename, vp, vtype, ap, ac3, &audioDemux->fd); } +/* not implemented */ +bool cPlayback::Start(std::string /*filename*/, std::string /*headers*/) +{ + return false; +} + bool PBPrivate::Start(char *filename, unsigned short vp, int vtype, unsigned short ap, int _ac3, int *audiofd) { struct stat s; @@ -740,7 +746,7 @@ void cPlayback::FindAllSubs(uint16_t *, unsigned short *, uint16_t *num, std::st *num = 0; } -bool cPlayback::SelectSubtitles(int) +bool cPlayback::SelectSubtitles(int, std::string) { return false; }