mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
This commit is contained in:
Stefan Seyfried
2013-07-06 19:01:15 +02:00
parent 3e2e647745 af662827d5
commit 7cfe54dc2f
91 changed files with 5546 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/infoviewer.cpp
View File

@@ -65,6 +65,7 @@
#include <daemonc/remotecontrol.h>
#include <driver/record.h>
#include <driver/display.h>
#include <driver/volume.h>
#include <zapit/satconfig.h>
#include <zapit/femanager.h>
@@ -123,6 +124,7 @@ CInfoViewer::CInfoViewer ()
strcpy(old_timestr, "");
oldinfo.current_uniqueKey = 0;
oldinfo.next_uniqueKey = 0;
isVolscale = false;
}
CInfoViewer::~CInfoViewer()
@@ -483,6 +485,14 @@ void CInfoViewer::showMovieTitle(const int playState, const std::string &Channel
const std::string &g_file_epg, const std::string &g_file_epg1,
const int duration, const int curr_pos)
{
if (g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_LEFT ||
g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_RIGHT ||
g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_CENTER ||
g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_HIGHER_CENTER)
isVolscale = CVolume::getInstance()->hideVolscale();
else
isVolscale = false;
check_channellogo_ca_SettingsChange();
aspectRatio = 0;
last_curr_id = last_next_id = 0;
@@ -623,6 +633,14 @@ void CInfoViewer::showTitle(t_channel_id chid, const bool calledFromNumZap, int
void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, const t_satellite_position satellitePosition, const t_channel_id new_channel_id, const bool calledFromNumZap, int epgpos, char *pname)
{
if (g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_LEFT ||
g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_RIGHT ||
g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_CENTER ||
g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_HIGHER_CENTER)
isVolscale = CVolume::getInstance()->hideVolscale();
else
isVolscale = false;
check_channellogo_ca_SettingsChange();
aspectRatio = 0;
last_curr_id = last_next_id = 0;
@@ -833,6 +851,9 @@ void CInfoViewer::loop(bool show_dot)
neutrino_msg_t msg;
neutrino_msg_data_t data;
if (isVolscale)
CVolume::getInstance()->showVolscale();
while (!(res & (messages_return::cancel_info | messages_return::cancel_all))) {
frameBuffer->blit();
g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd);
@@ -945,8 +966,10 @@ void CInfoViewer::loop(bool show_dot)
}
}
if (hideIt)
if (hideIt) {
CVolume::getInstance()->hideVolscale();
killTitle ();
}
g_RCInput->killTimer (sec_timer_id);
fader.Stop();