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

cec volume switch audiosystem/tv

Browse Source
This commit is contained in:
TangoCash
2021-01-31 18:16:08 +01:00
committed by Thilo Graf
parent 0329b7b783
commit 91a546d082
8 changed files with 118 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libarmbox/hdmi_cec.cpp
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (C) 2018-2020 TangoCash Copyright (C) 2018-2021 TangoCash
License: GPLv2 License: GPLv2
@@ -85,6 +85,7 @@ hdmi_cec::hdmi_cec()
fallback = false; fallback = false;
tv_off = true; tv_off = true;
deviceType = CEC_LOG_ADDR_TYPE_UNREGISTERED; deviceType = CEC_LOG_ADDR_TYPE_UNREGISTERED;
audio_destination = CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM;
} }
hdmi_cec::~hdmi_cec() hdmi_cec::~hdmi_cec()
@@ -812,7 +813,7 @@ void hdmi_cec::send_key(unsigned char key, unsigned char destination)
void hdmi_cec::request_audio_status() void hdmi_cec::request_audio_status()
{ {
struct cec_message txmessage; struct cec_message txmessage;
txmessage.destination = CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM; txmessage.destination = audio_destination;
txmessage.initiator = logicalAddress; txmessage.initiator = logicalAddress;
txmessage.data[0] = CEC_OPCODE_GIVE_AUDIO_STATUS; txmessage.data[0] = CEC_OPCODE_GIVE_AUDIO_STATUS;
txmessage.length = 1; txmessage.length = 1;
@@ -821,16 +822,31 @@ void hdmi_cec::request_audio_status()
void hdmi_cec::vol_up() void hdmi_cec::vol_up()
{ {
send_key(CEC_USER_CONTROL_CODE_VOLUME_UP, CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM); send_key(CEC_USER_CONTROL_CODE_VOLUME_UP, audio_destination);
request_audio_status(); request_audio_status();
} }
void hdmi_cec::vol_down() void hdmi_cec::vol_down()
{ {
send_key(CEC_USER_CONTROL_CODE_VOLUME_DOWN, CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM); send_key(CEC_USER_CONTROL_CODE_VOLUME_DOWN, audio_destination);
request_audio_status(); request_audio_status();
} }
void hdmi_cec::toggle_mute() void hdmi_cec::toggle_mute()
{ {
send_key(CEC_USER_CONTROL_CODE_MUTE, CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM); send_key(CEC_USER_CONTROL_CODE_MUTE, audio_destination);
request_audio_status(); request_audio_status();
} }
void hdmi_cec::SetAudioDestination(int audio_dest)
{
switch(audio_dest)
{
case 2:
audio_destination = CEC_OP_PRIM_DEVTYPE_TV;
break;
case 1:
default:
audio_destination = CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM;
break;
}
}

8
libarmbox/hdmi_cec.h
View File

@@ -2,7 +2,7 @@
#define __HDMI_CEC_H__ #define __HDMI_CEC_H__
/* /*
Copyright (C) 2018-2020 TangoCash Copyright (C) 2018-2021 TangoCash
License: GPLv2 License: GPLv2
@@ -79,6 +79,7 @@ private:
int volume; int volume;
bool fallback; bool fallback;
bool tv_off; bool tv_off;
unsigned char audio_destination;
protected: protected:
bool running; bool running;
public: public:
@@ -103,6 +104,11 @@ public:
{ {
return muted; return muted;
}; };
int GetAudioDestination()
{
return (int)audio_destination;
}
void SetAudioDestination(int audio_dest);
}; };
#endif // __HDMI_CEC_H__ #endif // __HDMI_CEC_H__

10
libarmbox/video.cpp
View File

@@ -1303,3 +1303,13 @@ void cVideo::SetCECAutoView(bool state)
{ {
hdmi_cec::getInstance()->SetCECAutoView(state); hdmi_cec::getInstance()->SetCECAutoView(state);
} }
int cVideo::GetAudioDestination()
{
return (int)hdmi_cec::getInstance()->GetAudioDestination();
}
void cVideo::SetAudioDestination(int audio_dest)
{
hdmi_cec::getInstance()->SetAudioDestination(audio_dest);
}

8
libarmbox/video_lib.h
View File

@@ -130,6 +130,12 @@ typedef enum {
VIDEO_HDMI_CEC_MODE_RECORDER = 1 VIDEO_HDMI_CEC_MODE_RECORDER = 1
} VIDEO_HDMI_CEC_MODE; } VIDEO_HDMI_CEC_MODE;
typedef enum {
VIDEO_HDMI_CEC_VOL_OFF = 0,
VIDEO_HDMI_CEC_VOL_AUDIOSYSTEM = 1,
VIDEO_HDMI_CEC_VOL_TV = 2
} VIDEO_HDMI_CEC_VOL;
typedef enum typedef enum
{ {
VIDEO_CONTROL_BRIGHTNESS = 0, VIDEO_CONTROL_BRIGHTNESS = 0,
@@ -238,6 +244,8 @@ class cVideo
bool SetCECMode(VIDEO_HDMI_CEC_MODE); bool SetCECMode(VIDEO_HDMI_CEC_MODE);
void SetCECAutoView(bool); void SetCECAutoView(bool);
void SetCECAutoStandby(bool); void SetCECAutoStandby(bool);
int GetAudioDestination();
void SetAudioDestination(int audio_dest);
bool ShowPicture(const char * fname); bool ShowPicture(const char * fname);
void StopPicture(); void StopPicture();
void Standby(unsigned int bOn); void Standby(unsigned int bOn);

32
libmipsbox/hdmi_cec.cpp
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (C) 2018-2020 TangoCash Copyright (C) 2018-2021 TangoCash
License: GPLv2 License: GPLv2
@@ -85,6 +85,7 @@ hdmi_cec::hdmi_cec()
fallback = false; fallback = false;
tv_off = true; tv_off = true;
deviceType = CEC_LOG_ADDR_TYPE_UNREGISTERED; deviceType = CEC_LOG_ADDR_TYPE_UNREGISTERED;
audio_destination = CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM;
} }
hdmi_cec::~hdmi_cec() hdmi_cec::~hdmi_cec()
@@ -593,9 +594,15 @@ void hdmi_cec::run()
struct epoll_event event; struct epoll_event event;
event.data.fd = hdmiFd; event.data.fd = hdmiFd;
event.events = EPOLLIN; event.events = EPOLLIN;
<<<<<<< HEAD
epoll_ctl(epollfd, EPOLL_CTL_ADD, hdmiFd, &event); epoll_ctl(epollfd, EPOLL_CTL_ADD, hdmiFd, &event);
=======
epoll_ctl(epollfd, EPOLL_CTL_ADD, hdmiFd, &event);
>>>>>>> e24aae1... cec volume switch audiosystem/tv
std::array<struct epoll_event, EPOLL_MAX_EVENTS> events; std::array<struct epoll_event, EPOLL_MAX_EVENTS> events;
while (running) while (running)
@@ -812,7 +819,7 @@ void hdmi_cec::send_key(unsigned char key, unsigned char destination)
void hdmi_cec::request_audio_status() void hdmi_cec::request_audio_status()
{ {
struct cec_message txmessage; struct cec_message txmessage;
txmessage.destination = CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM; txmessage.destination = audio_destination;
txmessage.initiator = logicalAddress; txmessage.initiator = logicalAddress;
txmessage.data[0] = CEC_OPCODE_GIVE_AUDIO_STATUS; txmessage.data[0] = CEC_OPCODE_GIVE_AUDIO_STATUS;
txmessage.length = 1; txmessage.length = 1;
@@ -821,16 +828,31 @@ void hdmi_cec::request_audio_status()
void hdmi_cec::vol_up() void hdmi_cec::vol_up()
{ {
send_key(CEC_USER_CONTROL_CODE_VOLUME_UP, CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM); send_key(CEC_USER_CONTROL_CODE_VOLUME_UP, audio_destination);
request_audio_status(); request_audio_status();
} }
void hdmi_cec::vol_down() void hdmi_cec::vol_down()
{ {
send_key(CEC_USER_CONTROL_CODE_VOLUME_DOWN, CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM); send_key(CEC_USER_CONTROL_CODE_VOLUME_DOWN, audio_destination);
request_audio_status(); request_audio_status();
} }
void hdmi_cec::toggle_mute() void hdmi_cec::toggle_mute()
{ {
send_key(CEC_USER_CONTROL_CODE_MUTE, CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM); send_key(CEC_USER_CONTROL_CODE_MUTE, audio_destination);
request_audio_status(); request_audio_status();
} }
void hdmi_cec::SetAudioDestination(int audio_dest)
{
switch(audio_dest)
{
case 2:
audio_destination = CEC_OP_PRIM_DEVTYPE_TV;
break;
case 1:
default:
audio_destination = CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM;
break;
}
}

8
libmipsbox/hdmi_cec.h
View File

@@ -2,7 +2,7 @@
#define __HDMI_CEC_H__ #define __HDMI_CEC_H__
/* /*
Copyright (C) 2018-2020 TangoCash Copyright (C) 2018-2021 TangoCash
License: GPLv2 License: GPLv2
@@ -79,6 +79,7 @@ private:
int volume; int volume;
bool fallback; bool fallback;
bool tv_off; bool tv_off;
unsigned char audio_destination;
protected: protected:
bool running; bool running;
public: public:
@@ -103,6 +104,11 @@ public:
{ {
return muted; return muted;
}; };
int GetAudioDestination()
{
return (int)audio_destination;
}
void SetAudioDestination(int audio_dest);
}; };
#endif // __HDMI_CEC_H__ #endif // __HDMI_CEC_H__

10
libmipsbox/video.cpp
View File

@@ -1278,3 +1278,13 @@ void cVideo::SetCECAutoView(bool state)
{ {
hdmi_cec::getInstance()->SetCECAutoView(state); hdmi_cec::getInstance()->SetCECAutoView(state);
} }
int cVideo::GetAudioDestination()
{
return (int)hdmi_cec::getInstance()->GetAudioDestination();
}
void cVideo::SetAudioDestination(int audio_dest)
{
hdmi_cec::getInstance()->SetAudioDestination(audio_dest);
}

9
libmipsbox/video_lib.h
View File

@@ -126,6 +126,12 @@ typedef enum {
VIDEO_HDMI_CEC_MODE_RECORDER = 1 VIDEO_HDMI_CEC_MODE_RECORDER = 1
} VIDEO_HDMI_CEC_MODE; } VIDEO_HDMI_CEC_MODE;
typedef enum {
VIDEO_HDMI_CEC_VOL_OFF = 0,
VIDEO_HDMI_CEC_VOL_AUDIOSYSTEM = 1,
VIDEO_HDMI_CEC_VOL_TV = 2
} VIDEO_HDMI_CEC_VOL;
typedef enum typedef enum
{ {
VIDEO_CONTROL_BRIGHTNESS = 0, VIDEO_CONTROL_BRIGHTNESS = 0,
@@ -234,7 +240,8 @@ class cVideo
bool SetCECMode(VIDEO_HDMI_CEC_MODE); bool SetCECMode(VIDEO_HDMI_CEC_MODE);
void SetCECAutoView(bool); void SetCECAutoView(bool);
void SetCECAutoStandby(bool); void SetCECAutoStandby(bool);
void ShowPicture(const char * fname); int GetAudioDestination();
void SetAudioDestination(int audio_dest);
void StopPicture(); void StopPicture();
void Standby(unsigned int bOn); 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); 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);