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-27 23:42:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tangocash/master'

Browse Source 
Origin commit data
------------------
Branch: master
Commit: bcd5908086
Author: max_10 <max_10@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2017-10-20 21:12:54 +02:00
parent ea66937767 dec022b20c
commit 52e0b8e6fd
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libarmbox/playback_gst.cpp
View File

@@ -462,7 +462,6 @@ bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/,
mAudioStream = 0; mAudioStream = 0;
//create playback path //create playback path
char file[400] = {""};
bool isHTTP = false; bool isHTTP = false;
if(!strncmp("http://", filename, 7)) if(!strncmp("http://", filename, 7))
@@ -493,10 +492,6 @@ bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/,
{ {
isHTTP = true; isHTTP = true;
} }
else
strcat(file, "file://");
strcat(file, filename);
if (isHTTP) if (isHTTP)
uri = g_uri_escape_string(filename, G_URI_RESERVED_CHARS_GENERIC_DELIMITERS, true); uri = g_uri_escape_string(filename, G_URI_RESERVED_CHARS_GENERIC_DELIMITERS, true);

18
libarmbox/video.cpp
View File

@@ -161,6 +161,7 @@ cVideo::cVideo(int, void *, void *, unsigned int unit)
} else } else
devnum = unit; devnum = unit;
fd = -1; fd = -1;
hdmiFd = -1;
standby_cec_activ = autoview_cec_activ = false; standby_cec_activ = autoview_cec_activ = false;
openDevice(); openDevice();
} }
@@ -787,9 +788,21 @@ bool cVideo::SetCECMode(VIDEO_HDMI_CEC_MODE _deviceType)
physicalAddress[0] = 0x10; physicalAddress[0] = 0x10;
physicalAddress[1] = 0x00; physicalAddress[1] = 0x00;
logicalAddress = 1; logicalAddress = 1;
deviceType = 1; /* default: recorder */
if (_deviceType == VIDEO_HDMI_CEC_MODE_OFF)
{
if (hdmiFd >= 0) {
close(hdmiFd);
hdmiFd = -1;
}
return false;
}
else
deviceType = _deviceType;
if (hdmiFd == -1)
hdmiFd = open("/dev/cec0", O_RDWR | O_CLOEXEC);
hdmiFd = open("/dev/cec0", O_RDWR | O_CLOEXEC);
if (hdmiFd >= 0) if (hdmiFd >= 0)
{ {
__u32 monitor = CEC_MODE_INITIATOR | CEC_MODE_FOLLOWER; __u32 monitor = CEC_MODE_INITIATOR | CEC_MODE_FOLLOWER;
@@ -863,6 +876,7 @@ bool cVideo::SetCECMode(VIDEO_HDMI_CEC_MODE _deviceType)
GetCECAddressInfo(); GetCECAddressInfo();
return true;
} }
void cVideo::GetCECAddressInfo() void cVideo::GetCECAddressInfo()

5
libarmbox/video_lib.h
View File

@@ -118,11 +118,10 @@ typedef enum {
VIDEO_STD_MAX = VIDEO_STD_AUTO VIDEO_STD_MAX = VIDEO_STD_AUTO
} VIDEO_STD; } VIDEO_STD;
/* not used, for dummy functions */
typedef enum { typedef enum {
VIDEO_HDMI_CEC_MODE_OFF = 0, VIDEO_HDMI_CEC_MODE_OFF = 0,
VIDEO_HDMI_CEC_MODE_TUNER, VIDEO_HDMI_CEC_MODE_TUNER = 3,
VIDEO_HDMI_CEC_MODE_RECORDER VIDEO_HDMI_CEC_MODE_RECORDER = 1
} VIDEO_HDMI_CEC_MODE; } VIDEO_HDMI_CEC_MODE;
typedef enum typedef enum