mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

movieplayer: show current AudioName in infoviewer

Browse Source 
Origin commit data
------------------
Commit: 3fd2a73d77
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-17 (Wed, 17 Oct 2012)
This commit is contained in:
Jacek Jendrzej
2012-10-17 21:39:44 +02:00
parent 4def9db10d
commit 705eb9e33a
3 changed files with 77 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer_bb.cpp
View File

@@ -55,6 +55,7 @@
#include <gui/widget/hintbox.h>
#include <gui/customcolor.h>
#include <gui/pictureviewer.h>
#include <gui/movieplayer.h>
#include <system/helpers.h>
#include <daemonc/remotecontrol.h>
@@ -233,10 +234,13 @@ void CInfoViewerBB::getBBButtonInfo()
text = g_settings.usermenu_text[SNeutrinoSettings::BUTTON_GREEN];
if (text == g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD))
text = "";
if (!g_RemoteControl->current_PIDs.APIDs.empty()) {
if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode() && !CMoviePlayerGui::getInstance().timeshift){
text = CMoviePlayerGui::getInstance().CurrentAudioName();
}else if (!g_RemoteControl->current_PIDs.APIDs.empty()) {
int selected = g_RemoteControl->current_PIDs.PIDs.selected_apid;
if (text.empty())
if (text.empty()){
text = g_RemoteControl->current_PIDs.APIDs[selected].desc;
}
}
break;
case CInfoViewerBB::BUTTON_SUBS:
@@ -711,10 +715,9 @@ void CInfoViewerBB::paint_ca_icons(int caid, char * icon, int &icon_space_offset
void CInfoViewerBB::showIcon_CA_Status(int notfirst)
{
if (g_settings.casystem_display == 3)
return;
if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode()){
if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode() && !CMoviePlayerGui::getInstance().timeshift){
if (g_settings.casystem_display == 2) {
fta = true;
showOne_CAIcon();