Removed libcontrold dependency

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@336 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 35d7d555b6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-14 (Sun, 14 Feb 2010)



------------------
This commit was generated by Migit

src/gui/audioplayer.cpp

@@ -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");

src/gui/movieplayer.cpp

@@ -133,8 +133,6 @@ std::string g_file_epg;
 std::string g_file_epg1;
 bool showaudioselectdialog = false;
 
-void checkAspectRatio(int vdec, bool init);
-
 bool get_movie_info_apid_name(int apid, MI_MOVIE_INFO * movie_info, std::string * apidtitle)
 {
 	if (movie_info == NULL || apidtitle == NULL)
@@ -1262,41 +1260,6 @@ void CMoviePlayerGui::PlayFile(void)
 		InfoClock->StartClock();
 }
 
-// checks if AR has changed an sets cropping mode accordingly (only video mode auto)
-static short archeck;
-void checkAspectRatio(int /*vdec*/, bool init)
-{
-	static time_t last_check = 0;
-
-	// only necessary for auto mode, check each 5 sec. max
-	if (g_settings.video_Format != 0 || (!init && time(NULL) <= last_check + archeck))
-		return;
-#if 0
-	char aspectRatio = 2;
-	if (init) {
-		aspectRatio = g_Controld->getAspectRatio();
-		last_check = 0;
-		archeck = 1;
-		return;
-	} else {
-		char newRatio = g_Controld->getAspectRatio();
-		if (newRatio != aspectRatio) {
-			printf("[movieplayer] AR change detected in auto mode, adjusting display format\n");
-			video_displayformat_t vdt;
-			if (newRatio == 2)
-				vdt = VIDEO_LETTER_BOX;
-			else
-				vdt = VIDEO_CENTER_CUT_OUT;
-			if (ioctl(vdec, VIDEO_SET_DISPLAY_FORMAT, vdt))
-				perror("[movieplayer] VIDEO_SET_DISPLAY_FORMAT");
-			aspectRatio = newRatio;
-			archeck = 5;
-		}
-		last_check = time(NULL);
-	}
-#endif
-}
-
 void CMoviePlayerGui::showHelpTS()
 {
 	Helpbox helpbox;

src/gui/plugins.cpp

@@ -466,9 +466,6 @@ void CPlugins::startPlugin(int number,int /*param*/)
 				if (ispip) {
 					g_Sectionsd->setPauseScanning (true);
 					g_Zapit->setEventMode(false);
-#if 0
-					//g_Controld->setEventMode(false);
-#endif
 					if (g_Zapit->isPlayBackActive()) {
 						if (!CNeutrinoApp::getInstance()->recordingstatus)
 							g_Zapit->setRecordMode(true);
@@ -520,9 +517,6 @@ void CPlugins::startPlugin(int number,int /*param*/)
 			if (!CNeutrinoApp::getInstance()->recordingstatus) {
 				g_Zapit->setRecordMode(false);
 			}
-#if 0
-			//g_Controld->setEventMode(true);
-#endif
 			g_Zapit->setEventMode(true);
 			g_Sectionsd->setPauseScanning (false);
 		}

src/gui/upnpbrowser.cpp

@@ -804,12 +804,6 @@ bool CUpnpBrowserGui::selectItem(std::string id)
 
 						if (g_settings.video_Format==1)
 							viewer->SetAspectRatio(16.0/9);
-						else if (g_settings.video_Format==0)
-						{
-							CControldClient cdc;
-							cdc.setVideoFormat(CControldClient::VIDEOFORMAT_4_3);
-							viewer->SetAspectRatio(4.0/3);
-						}
 						else
 							viewer->SetAspectRatio(4.0/3);
 

src/gui/widget/Makefile.am

@@ -16,7 +16,6 @@ libneutrino_gui_widget_a_SOURCES = \
 	colorchooser.cpp keychooser.cpp \
 	menue.cpp stringinput.cpp stringinput_ext.cpp \
 	messagebox.cpp hintbox.cpp listbox.cpp listbox_legacy.cpp \
-	rgbcsynccontroler.cpp \
 	drawable.cpp hintboxext.cpp helpbox.cpp mountchooser.cpp \
 	listframe.cpp msgbox.cpp textbox.cpp progressbar.cpp