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

Removed libcontrold dependency

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@336 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-14 13:09:07 +00:00
parent e642e6f345
commit 35d7d555b6
15 changed files with 44 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/audioplayer.cpp
View File

@@ -263,13 +263,11 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &)
m_current = 0;
m_selected = 0;
//m_width = 710;
//if((g_settings.screen_EndX - g_settings.screen_StartX) < m_width+ConnectLineBox_Width)
m_width=(g_settings.screen_EndX - g_settings.screen_StartX) - ConnectLineBox_Width - 5;
//m_height = 570;
//if((g_settings.screen_EndY - g_settings.screen_StartY) < m_height)
m_height = (g_settings.screen_EndY - g_settings.screen_StartY - 5);
m_sheight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
m_buttonHeight = std::min(25, m_sheight);
m_theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
m_fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
@@ -288,15 +286,11 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &)
{
parent->hide();
}
#if 0
if (g_settings.video_Format != g_settings.video_backgroundFormat)
g_Controld->setVideoFormat(g_settings.video_backgroundFormat);
#endif
bool usedBackground = m_frameBuffer->getuseBackground();
if (usedBackground)
m_frameBuffer->saveBackgroundImage();
// set zapit in standby mode
g_Zapit->stopPlayBack();
@@ -304,18 +298,9 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &)
// tell neutrino we're in audio mode
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoMessages::mode_audio );
#if 0
// remember last mode
CZapitClient::responseGetLastChannel firstchannel;
g_Zapit->getLastChannel(firstchannel.channelNumber, firstchannel.mode);
if ((firstchannel.mode == 'r') ?
(CNeutrinoApp::getInstance()->zapto_radio_on_init_done) :
(CNeutrinoApp::getInstance()->zapto_tv_on_init_done))
m_LastMode=(CNeutrinoApp::getInstance()->getLastMode() | NeutrinoMessages::norezap);
else
m_LastMode=(CNeutrinoApp::getInstance()->getLastMode());
#endif
m_LastMode=(CNeutrinoApp::getInstance()->getLastMode());
// Stop sectionsd
g_Sectionsd->setPauseScanning(true);
@@ -331,11 +316,6 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &)
m_frameBuffer->useBackground(usedBackground);
m_frameBuffer->paintBackground();
// Restore last mode
//t_channel_id channel_id=CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID();
//g_Zapit->zapTo_serviceID(channel_id);
//g_Zapit->setStandby(false);
puts("[audioplayer.cpp] executing " AUDIOPLAYER_END_SCRIPT ".");
if (system(AUDIOPLAYER_END_SCRIPT) != 0)
perror("Datei " AUDIOPLAYER_END_SCRIPT " fehlt. Bitte erstellen, wenn gebraucht.\nFile " AUDIOPLAYER_END_SCRIPT " not found. Please create if needed.\n");