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-pc build

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 8df85c94e8
Author: martii <m4rtii@gmx.de>
Date: 2013-11-02 (Sat, 02 Nov 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-11-02 15:12:10 +01:00
parent e2c442c898
commit 521df793f9
3 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
generic-pc/playback.cpp
View File

@@ -13,14 +13,14 @@ void cPlayback::Close(void)
{
}
bool cPlayback::Start(char * filename, unsigned short vpid, int vtype, unsigned short apid, bool ac3, int duration, bool /*noprobe*/)
bool cPlayback::Start(char * filename, int vpid, int vtype, int apid, bool ac3, int duration, bool /*noprobe*/)
{
printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d duration=%i\n",
FILENAME, __func__, filename, vpid, vtype, apid, ac3, duration);
return true;
}
bool cPlayback::SetAPid(unsigned short pid, bool /*ac3*/)
bool cPlayback::SetAPid(int pid, bool /*ac3*/)
{
printf("%s:%s pid %i\n", FILENAME, __func__, pid);
return true;
@@ -57,18 +57,18 @@ bool cPlayback::SetPosition(int position, bool)
return true;
}
void cPlayback::FindAllPids(uint16_t *, unsigned short *, uint16_t *numpida, std::string *)
void cPlayback::FindAllPids(int *, unsigned int *, unsigned int *numpida, std::string *)
{
printf("%s:%s\n", FILENAME, __func__);
*numpida = 0;
}
void cPlayback::FindAllSubtitlePids(uint16_t * /*pids*/, uint16_t *numpids, std::string * /*language*/)
void cPlayback::FindAllSubtitlePids(int * /*pids*/, unsigned int *numpids, std::string * /*language*/)
{
*numpids = 0;
}
bool cPlayback::SetSubtitlePid(unsigned short /*pid*/)
bool cPlayback::SetSubtitlePid(int /*pid*/)
{
return true;
}
@@ -77,22 +77,22 @@ void cPlayback::GetPts(uint64_t &/*pts*/)
{
}
bool cPlayback::SetDvbsubtitlePid(unsigned short /*pid*/)
bool cPlayback::SetDvbsubtitlePid(int /*pid*/)
{
return true;
}
bool cPlayback::SetTeletextPid(unsigned short /*pid*/)
bool cPlayback::SetTeletextPid(int /*pid*/)
{
return true;
}
void cPlayback::FindAllDvbsubtitlePids(uint16_t * /*pids*/, uint16_t *numpids, std::string * /*language*/)
void cPlayback::FindAllDvbsubtitlePids(int * /*pids*/, unsigned int *numpidd, std::string * /*language*/)
{
*numpids = 0;
*numpidd = 0;
}
void cPlayback::FindAllTeletextsubtitlePids(uint16_t * /*pids*/, uint16_t *numpids, std::string * /*language*/)
void cPlayback::FindAllTeletextsubtitlePids(int * /*pids*/, unsigned int *numpids, std::string * /*language*/)
{
*numpids = 0;
}
@@ -105,11 +105,12 @@ void cPlayback::RequestAbort()
{
}
unsigned short cPlayback::GetTeletextPid(void)
int cPlayback::GetTeletextPid(void)
{
return -1;
}
void cPlayback::FindAllSubs(uint16_t *, unsigned short *, uint16_t *numpida, std::string *)
void cPlayback::FindAllSubs(int *, unsigned int *, unsigned int *numpida, std::string *)
{
printf("%s:%s\n", FILENAME, __func__);
*numpida = 0;

29
generic-pc/playback.h
View File

@@ -23,28 +23,29 @@ class cPlayback
cPlayback(int, void (*)(uint32_t **, unsigned int *, unsigned int *, unsigned int *, void (**)(void)) = NULL) { };
bool Open(playmode_t PlayMode);
void Close(void);
bool Start(char * filename, unsigned short vpid, int vtype, unsigned short apid, bool ac3, int duration, bool no_probe = true);
bool Start(char * filename, int vpid, int vtype, int apid, bool ac3, int duration, bool no_probe = true);
bool Stop(void);
bool SetAPid(unsigned short pid, bool ac3);
bool SetSubtitlePid(unsigned short pid);
bool SetDvbsubtitlePid(unsigned short pid);
bool SetTeletextPid(unsigned short pid);
unsigned short GetAPid(void) { return mAudioStream; }
unsigned short GetSubtitlePid(void) { return mSubtitleStream; }
unsigned short GetDvbsubtitlePid(void) { return mDvbsubtitleStream; }
unsigned short GetTeletextPid(void);
bool SetAPid(int pid, bool ac3);
bool SetSubtitlePid(int pid);
bool SetDvbsubtitlePid(int pid);
bool SetTeletextPid(int pid);
int GetAPid(void) { return mAudioStream; }
int GetSubtitlePid(void) { return mSubtitleStream; }
int GetDvbsubtitlePid(void) { return mDvbsubtitleStream; }
int GetTeletextPid(void);
void SuspendSubtitle(bool);
bool SetSpeed(int speed);
bool GetSpeed(int &speed) const;
bool GetPosition(int &position, int &duration);
void GetPts(uint64_t &pts);
bool SetPosition(int position, bool absolute = false);
void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language);
void FindAllSubtitlePids(uint16_t *pids, uint16_t *numpids, std::string *language);
void FindAllDvbsubtitlePids(uint16_t *pids, uint16_t *numpids, std::string *language);
void FindAllTeletextsubtitlePids(uint16_t *pids, uint16_t *numpidt, std::string *tlanguage);
void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language);
void FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language);
void FindAllDvbsubtitlePids(int *pids, unsigned int *numpidd, std::string *language);
void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage);
void RequestAbort(void);
void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language);
bool isPlaying(void) { return false; }
void FindAllSubs(int *pids, unsigned int *supported, unsigned int *numpida, std::string *language);
bool SelectSubtitles(int pid);
void GetChapters(std::vector<int> &positions, std::vector<std::string> &titles);
//

2
libspark/playback_libeplayer3.h
View File

@@ -45,7 +45,7 @@ class cPlayback
bool SetPosition(int position, bool absolute = false);
void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language);
void FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language);
void FindAllDvbsubtitlePids(int *pids, unsigned int *numpids, std::string *language);
void FindAllDvbsubtitlePids(int *pids, unsigned int *numpidd, std::string *language);
void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage);
void RequestAbort(void);
bool isPlaying(void);