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-30 00:40:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/max_10/libstb-hal-max

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 9bed7b0cf8
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-15 (Fri, 15 Mar 2019)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-03-15 21:33:01 +01:00
parent 298ad47b00 913f08f446
commit eb8d02ae57
13 changed files with 60 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libarmbox/video.cpp
View File

@@ -632,18 +632,26 @@ void cVideo::SetVideoMode(analog_mode_t mode)
proc_put("/proc/stb/avs/0/colorformat", m, strlen(m));
}
void cVideo::ShowPicture(const char * fname)
bool cVideo::ShowPicture(const char * fname)
{
hal_info("%s(%s)\n", __func__, fname);
bool ret = false;
hal_debug("%s(%s)\n", __func__, fname);
if (video_standby)
{
/* does not work and the driver does not seem to like it */
hal_info("%s: video_standby == true\n", __func__);
return;
return ret;
}
/* in movieplayer mode, fd is not opened */
if (fd == -1)
{
hal_info("%s: decoder not opened\n", __func__);
return ret;
}
struct stat st;
if (stat(fname, &st)){
return;
return ret;
}
closeDevice();
openDevice();
@@ -663,8 +671,9 @@ void cVideo::ShowPicture(const char * fname)
usleep(150000);
ioctl(fd, VIDEO_STOP, 0);
ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
ret = true;
}
return;
return ret;
}
void cVideo::StopPicture()
@@ -918,7 +927,7 @@ void cVideo::SetControl(int control, int value)
case VIDEO_CONTROL_ZAPPING_MODE:
zapping_mode = value;
const char *mode_zapping[] = { "hold", "mute" };
proc_put("/proc/stb/video/zapping_mode", mode_zapping[zapping_mode], strlen(mode_zapping[zapping_mode]));
proc_put("/proc/stb/video/zapmode", mode_zapping[zapping_mode], strlen(mode_zapping[zapping_mode]));
break;
}
if (p) {

2
libarmbox/video_lib.h
View File

@@ -237,7 +237,7 @@ class cVideo
bool SetCECMode(VIDEO_HDMI_CEC_MODE);
void SetCECAutoView(bool);
void SetCECAutoStandby(bool);
void ShowPicture(const char * fname);
bool ShowPicture(const char * fname);
void StopPicture();
void Standby(unsigned int bOn);
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);