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

ShowPicture: revert API change

Browse Source
This commit is contained in:
martii
2013-06-07 16:21:04 +02:00
parent 4e439cdb41
commit e10d6a5a18
4 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
generic-pc/video.cpp
View File

@@ -211,11 +211,7 @@ void cVideo::SetVideoMode(analog_mode_t)
{ {
} }
#ifdef MARTII
void cVideo::ShowPicture(const char *fname, bool)
#else
void cVideo::ShowPicture(const char *fname) void cVideo::ShowPicture(const char *fname)
#endif
{ {
lt_info("%s(%s)\n", __func__, fname); lt_info("%s(%s)\n", __func__, fname);
if (access(fname, R_OK)) if (access(fname, R_OK))

4
generic-pc/video_lib.h
View File

@@ -178,11 +178,7 @@ class cVideo : public OpenThreads::Thread
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; }; bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
void SetCECAutoView(bool) { return; }; void SetCECAutoView(bool) { return; };
void SetCECAutoStandby(bool) { return; }; void SetCECAutoStandby(bool) { return; };
#ifdef MARTII
void ShowPicture(const char * fname, bool isM2V = false);
#else
void ShowPicture(const char * fname); void ShowPicture(const char * fname);
#endif
void StopPicture(); void StopPicture();
void Standby(unsigned int bOn); void Standby(unsigned int bOn);
#ifdef MARTII #ifdef MARTII

7
libspark/video.cpp
View File

@@ -370,11 +370,7 @@ void cVideo::SetVideoMode(analog_mode_t mode)
proc_put("/proc/stb/avs/0/colorformat", m, strlen(m)); proc_put("/proc/stb/avs/0/colorformat", m, strlen(m));
} }
#ifdef MARTII
void cVideo::ShowPicture(const char * fname, bool isM2V)
#else
void cVideo::ShowPicture(const char * fname) void cVideo::ShowPicture(const char * fname)
#endif
{ {
lt_debug("%s(%s)\n", __func__, fname); lt_debug("%s(%s)\n", __func__, fname);
#ifndef MARTII #ifndef MARTII
@@ -393,7 +389,8 @@ void cVideo::ShowPicture(const char * fname)
return; return;
} }
#ifdef MARTII #ifdef MARTII
if (isM2V) const char *lastDot = strrchr(fname, '.');
if (lastDot && !strcasecmp(lastDot + 1, "m2v"))
strncpy(destname, fname, sizeof(destname)); strncpy(destname, fname, sizeof(destname));
else { else {
#endif #endif

4
libspark/video_lib.h
View File

@@ -174,11 +174,7 @@ class cVideo
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; }; bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
void SetCECAutoView(bool) { return; }; void SetCECAutoView(bool) { return; };
void SetCECAutoStandby(bool) { return; }; void SetCECAutoStandby(bool) { return; };
#ifdef MARTII
void ShowPicture(const char * fname, bool isM2V = false);
#else
void ShowPicture(const char * fname); void ShowPicture(const char * fname);
#endif
void StopPicture(); void StopPicture();
void Standby(unsigned int bOn); void Standby(unsigned int bOn);
#ifdef MARTII #ifdef MARTII