cPlayback: implement new libcoolstream interfaces

a new "Start" and changed "SelectSubtitles" function are
implemented to fix compilation (mostly stubbed out, though)
This commit is contained in:
Stefan Seyfried
2016-10-22 11:29:32 +02:00
parent db3ec7352e
commit fd2f0f1fd4
5 changed files with 28 additions and 5 deletions

View File

@@ -300,6 +300,11 @@ bool cPlayback::Open(playmode_t PlayMode)
return 0; return 0;
} }
bool cPlayback::Start(std::string /*filename*/, std::string /*headers*/)
{
return false;
}
//Used by Fileplay //Used by Fileplay
bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short _apid, bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short _apid,
int ac3, unsigned int duration) int ac3, unsigned int duration)
@@ -366,7 +371,7 @@ bool cPlayback::SetAPid(unsigned short pid, int /*ac3*/)
return true; return true;
} }
bool cPlayback::SelectSubtitles(int pid) bool cPlayback::SelectSubtitles(int pid, std::string /*charset*/)
{ {
lt_info("%s: pid %i\n", __func__, pid); lt_info("%s: pid %i\n", __func__, pid);
if (pid != pd->subpid) if (pid != pd->subpid)

View File

@@ -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) 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", 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; return true;
} }
bool cPlayback::SelectSubtitles(int pid) bool cPlayback::SelectSubtitles(int pid, std::string /*charset*/)
{ {
printf("%s:%s pid %i\n", FILENAME, __func__, pid); printf("%s:%s pid %i\n", FILENAME, __func__, pid);
return true; return true;

View File

@@ -41,6 +41,7 @@ public:
bool Open(playmode_t PlayMode); bool Open(playmode_t PlayMode);
void Close(void); void Close(void);
bool Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int duration); 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 Stop(void);
bool SetAPid(unsigned short pid, int audio_flag); bool SetAPid(unsigned short pid, int audio_flag);
bool SetSpeed(int speed); bool SetSpeed(int speed);
@@ -49,7 +50,7 @@ public:
bool SetPosition(int position, bool absolute = false); bool SetPosition(int position, bool absolute = false);
void FindAllPids(uint16_t *pids, unsigned short *aud_flags, uint16_t *num, std::string *language); 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); 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<int> &positions, std::vector<std::string> &titles); void GetChapters(std::vector<int> &positions, std::vector<std::string> &titles);
void RequestAbort(); void RequestAbort();
void GetTitles(std::vector<int> &playlists, std::vector<std::string> &titles, int &current); void GetTitles(std::vector<int> &playlists, std::vector<std::string> &titles, int &current);

View File

@@ -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 cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int)
{ {
bool ret = false; bool ret = false;
@@ -444,7 +450,7 @@ void cPlayback::FindAllSubs(uint16_t * /*pids*/, unsigned short * /*supp*/, uint
*num = 0; *num = 0;
} }
bool cPlayback::SelectSubtitles(int pid) bool cPlayback::SelectSubtitles(int pid, std::string /*charset*/)
{ {
lt_info("%s pid %d\n", __func__, pid); lt_info("%s pid %d\n", __func__, pid);
return false; return false;

View File

@@ -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); 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) bool PBPrivate::Start(char *filename, unsigned short vp, int vtype, unsigned short ap, int _ac3, int *audiofd)
{ {
struct stat s; struct stat s;
@@ -740,7 +746,7 @@ void cPlayback::FindAllSubs(uint16_t *, unsigned short *, uint16_t *num, std::st
*num = 0; *num = 0;
} }
bool cPlayback::SelectSubtitles(int) bool cPlayback::SelectSubtitles(int, std::string)
{ {
return false; return false;
} }