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
This commit is contained in:
[CST] Focus
2010-02-14 13:09:07 +00:00
parent f789c1e8c6
commit b4e06b4d0b
15 changed files with 44 additions and 109 deletions

View File

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