mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-31 17:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
martii
2013-06-08 15:39:35 +02:00
parent eae9d7a7a1
commit 23bea61473
22 changed files with 17 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
generic-pc/glfb.cpp
View File

@@ -151,12 +151,11 @@ void GLFramebuffer::initKeys()
mKeyMap['7'] = KEY_7;
mKeyMap['8'] = KEY_8;
mKeyMap['9'] = KEY_9;
#ifdef MARTII
mKeyMap['r'] = KEY_RED;
mKeyMap['g'] = KEY_GREEN;
mKeyMap['y'] = KEY_YELLOW;
mKeyMap['b'] = KEY_BLUE;
#endif
}
void GLFramebuffer::run()

15
generic-pc/playback.cpp
View File

@@ -13,11 +13,7 @@ void cPlayback::Close(void)
{
}
#ifdef MARTII
bool cPlayback::Start(char * filename, unsigned short vpid, int vtype, unsigned short apid, bool ac3, int duration, bool /*noprobe*/)
#else
bool cPlayback::Start(char * filename, unsigned short vpid, int vtype, unsigned short apid, bool ac3, int duration)
#endif
{
printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d duration=%i\n",
FILENAME, __func__, filename, vpid, vtype, apid, ac3, duration);
@@ -30,14 +26,6 @@ bool cPlayback::SetAPid(unsigned short pid, bool /*ac3*/)
return true;
}
#ifndef MARTII
bool cPlayback::SetSPid(int pid)
{
printf("%s:%s pid %i\n", FILENAME, __func__, pid);
return true;
}
#endif
bool cPlayback::SetSpeed(int speed)
{
printf("%s:%s playing %d speed %d\n", FILENAME, __func__, playing, speed);
@@ -68,7 +56,7 @@ void cPlayback::FindAllPids(uint16_t *, unsigned short *, uint16_t *numpida, std
printf("%s:%s\n", FILENAME, __func__);
*numpida = 0;
}
#ifdef MARTII
void cPlayback::FindAllSubtitlePids(uint16_t * /*pids*/, uint16_t *numpids, std::string * /*language*/)
{
*numpids = 0;
@@ -110,7 +98,6 @@ void cPlayback::RequestAbort()
unsigned short cPlayback::GetTeletextPid(void)
{
}
#endif
cPlayback::cPlayback(int /*num*/)
{

16
generic-pc/playback.h
View File

@@ -13,27 +13,18 @@ class cPlayback
{
private:
bool playing;
#ifdef MARTII
int mAudioStream;
int mSubtitleStream;
int mDvbsubtitleStream;
int mTeletextStream;
void (*framebuffer_callback)(unsigned char **, unsigned int *, unsigned int *, unsigned int *, int *);
#endif
public:
#ifdef MARTII
cPlayback(int num __attribute__((unused))= 0, void (* /*fbcb*/)(unsigned char **, unsigned int *, unsigned int *, unsigned int *, int *) = NULL) { };
#endif
bool Open(playmode_t PlayMode);
void Close(void);
#ifdef MARTII
bool Start(char * filename, unsigned short vpid, int vtype, unsigned short apid, bool ac3, int duration, bool no_probe = true);
#else
bool Start(char * filename, unsigned short vpid, int vtype, unsigned short apid, bool ac3, int duration);
#endif
bool Stop(void);
bool SetAPid(unsigned short pid, bool ac3);
#ifdef MARTII
bool SetSubtitlePid(unsigned short pid);
bool SetDvbsubtitlePid(unsigned short pid);
bool SetTeletextPid(unsigned short pid);
@@ -42,23 +33,16 @@ class cPlayback
unsigned short GetDvbsubtitlePid(void) { return mDvbsubtitleStream; }
unsigned short GetTeletextPid(void);
void SuspendSubtitle(bool);
#else
bool SetSPid(int pid);
#endif
bool SetSpeed(int speed);
bool GetSpeed(int &speed) const;
bool GetPosition(int &position, int &duration);
bool SetPosition(int position, bool absolute = false);
void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language);
#ifdef MARTII
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 RequestAbort(void);
#else
void FindAllSPids(int *spids, uint16_t *numpids, std::string *language);
#endif
//
cPlayback(int num = 0);
~cPlayback();

4
generic-pc/video.cpp
View File

@@ -326,11 +326,7 @@ int cVideo::getBlank(void)
return 0;
}
#ifdef MARTII
void cVideo::Pig(int x, int y, int w, int h, int /*osd_w*/, int /*osd_h*/, int /*startx*/, int /*starty*/, int /*endx*/, int /*endy*/)
#else
void cVideo::Pig(int x, int y, int w, int h, int, int)
#endif
{
pig_x = x;
pig_y = y;

4
generic-pc/video_lib.h
View File

@@ -181,11 +181,7 @@ class cVideo : public OpenThreads::Thread
void ShowPicture(const char * fname);
void StopPicture();
void Standby(unsigned int bOn);
#ifdef MARTII
void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600, int startx = 0, int starty = 0, int endx = 1279, int endy = 719);
#else
void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600);
#endif
void SetControl(int, int) { return; };
void setContrast(int val);
void SetVideoMode(analog_mode_t mode);