mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

unbreak generic build

Browse Source 
Origin commit data
------------------
Branch: master
Commit: aeec7f13a0
Author: martii <m4rtii@gmx.de>
Date: 2014-04-13 (Sun, 13 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-13 10:07:06 +02:00
parent 4dc670a971
commit da596c2446
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
generic-pc/playback.cpp
View File

@@ -13,7 +13,7 @@ void cPlayback::Close(void)
{ {
} }
bool cPlayback::Start(char * filename, int vpid, int vtype, int apid, bool ac3, int duration, bool /*noprobe*/) bool cPlayback::Start(char * filename, int vpid, int vtype, int apid, int ac3, 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",
FILENAME, __func__, filename, vpid, vtype, apid, ac3, duration); FILENAME, __func__, filename, vpid, vtype, apid, ac3, duration);
@@ -82,7 +82,7 @@ bool cPlayback::SetTeletextPid(int /*pid*/)
return true; return true;
} }
void cPlayback::FindAllTeletextsubtitlePids(int * /*pids*/, unsigned int *numpids, std::string * /*language*/) void cPlayback::FindAllTeletextsubtitlePids(int *, unsigned int *numpids, std::string *, int *, int *)
{ {
*numpids = 0; *numpids = 0;
} }

9
generic-pc/playback.h
View File

@@ -21,8 +21,7 @@ class cPlayback
cPlayback(int); cPlayback(int);
bool Open(playmode_t PlayMode); bool Open(playmode_t PlayMode);
void Close(void); void Close(void);
bool Start(char *filename, int vpid, int vtype, int apid, bool ac3, int duration, bool no_probe = true); bool Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration);
bool Stop(void);
bool SetAPid(int pid, bool ac3); bool SetAPid(int pid, bool ac3);
bool SetSubtitlePid(int pid); bool SetSubtitlePid(int pid);
bool SetTeletextPid(int pid); bool SetTeletextPid(int pid);
@@ -30,6 +29,7 @@ class cPlayback
int GetSubtitlePid(void) { return mSubtitleStream; } int GetSubtitlePid(void) { return mSubtitleStream; }
int GetTeletextPid(void); int GetTeletextPid(void);
void SuspendSubtitle(bool); void SuspendSubtitle(bool);
int GetFirstTeletextPid(void);
bool SetSpeed(int speed); bool SetSpeed(int speed);
bool GetSpeed(int &speed) const; bool GetSpeed(int &speed) const;
bool GetPosition(int &position, int &duration); bool GetPosition(int &position, int &duration);
@@ -37,11 +37,14 @@ class cPlayback
bool SetPosition(int position, bool absolute = false); bool SetPosition(int position, bool absolute = false);
void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language); void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language);
void FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language); void FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language);
void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage); void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage, int *mags, int *pages);
void RequestAbort(void); void RequestAbort(void);
bool IsPlaying(void) { return false; } bool IsPlaying(void) { return false; }
uint64_t GetReadCount(void);
void FindAllSubs(int *pids, unsigned int *supported, unsigned int *numpida, std::string *language); void FindAllSubs(int *pids, unsigned int *supported, unsigned int *numpida, std::string *language);
bool SelectSubtitles(int pid); bool SelectSubtitles(int pid);
void GetChapters(std::vector<int> &positions, std::vector<std::string> &titles); void GetChapters(std::vector<int> &positions, std::vector<std::string> &titles);
void GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values); void GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values);
// //

2
libspark/playback_libeplayer3.cpp
View File

@@ -46,7 +46,7 @@ void cPlayback::Close(void)
} }
} }
bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, unsigned int) bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, int)
{ {
bool ret = false; bool ret = false;
bool isHTTP = false; bool isHTTP = false;

2
libspark/playback_libeplayer3.h
View File

@@ -32,7 +32,7 @@ class cPlayback
bool Open(playmode_t PlayMode); bool Open(playmode_t PlayMode);
void Close(void); void Close(void);
bool Start(char *filename, int vpid, int vtype, int apid, int ac3, unsigned int duration); bool Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration);
bool SetAPid(int pid, bool ac3); bool SetAPid(int pid, bool ac3);
bool SetSubtitlePid(int pid); bool SetSubtitlePid(int pid);
bool SetTeletextPid(int pid); bool SetTeletextPid(int pid);