diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 775de6bf8..3fa9b6abf 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -192,6 +192,7 @@ void CMoviePlayerGui::Init(void) tsfilefilter.addFilter("mpv"); tsfilefilter.addFilter("vob"); tsfilefilter.addFilter("m2ts"); + tsfilefilter.addFilter("mp4"); vlcfilefilter.addFilter("mpg"); diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index d0aeb14ac..d5519d2a7 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -3359,6 +3359,27 @@ bool CNeutrinoApp::showUserMenu(int button) menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, StreamFeaturesChanger, "teletext", key, icon); menu->addItem(menu_item, 0); break; + case SNeutrinoSettings::ITEM_IMAGEINFO: + menu_items++; + menu_prev = SNeutrinoSettings::ITEM_IMAGEINFO; + keyhelper.get(&key,&icon); + menu->addItem(new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, new CImageInfo(), NULL, key, icon ), false); + break; + case SNeutrinoSettings::ITEM_BOXINFO: + menu_items++; + menu_prev = SNeutrinoSettings::ITEM_BOXINFO; + keyhelper.get(&key,&icon); + menu->addItem( new CMenuForwarder(LOCALE_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, key, icon)); + break; + case SNeutrinoSettings::ITEM_CAM: + if(cs_get_revision() != 10) + { + menu_items++; + menu_prev = SNeutrinoSettings::ITEM_CAM; + keyhelper.get(&key,&icon); + menu->addItem(new CMenuForwarder(LOCALE_CAM_SETTINGS, true, NULL, g_CamHandler, NULL, key, icon)); + } + break; #if 0 // FIXME not supported yet case SNeutrinoSettings::ITEM_MOVIEPLAYER_TS: diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 65616999b..174907499 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -858,6 +858,10 @@ const CMenuOptionChooser::keyval USERMENU_ITEM_OPTIONS[USERMENU_ITEM_OPTION_COUN { SNeutrinoSettings::ITEM_TECHINFO, LOCALE_EPGMENU_STREAMINFO }, { SNeutrinoSettings::ITEM_PLUGIN, LOCALE_TIMERLIST_PLUGIN }, { SNeutrinoSettings::ITEM_VTXT, LOCALE_USERMENU_ITEM_VTXT }, + { SNeutrinoSettings::ITEM_IMAGEINFO, LOCALE_SERVICEMENU_IMAGEINFO }, + { SNeutrinoSettings::ITEM_BOXINFO, LOCALE_DBOXINFO }, + { SNeutrinoSettings::ITEM_CAM, LOCALE_CAM_SETTINGS }, + #if 0 { SNeutrinoSettings::ITEM_MOVIEPLAYER_TS, LOCALE_MAINMENU_MOVIEPLAYER } , { SNeutrinoSettings::ITEM_RESTART_CAMD, LOCALE_EXTRA_RESTARTCAMD } diff --git a/src/system/settings.h b/src/system/settings.h index 45a5fc50b..842e210a1 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -483,9 +483,12 @@ struct SNeutrinoSettings ITEM_TECHINFO = 13, ITEM_REMOTE = 14, ITEM_PLUGIN = 15, + ITEM_IMAGEINFO, + ITEM_BOXINFO, + ITEM_CAM, #if 0 - ITEM_MOVIEPLAYER_TS = 16, - ITEM_RESTART_CAMD = 17, + ITEM_MOVIEPLAYER_TS, + ITEM_RESTART_CAMD, #endif ITEM_MAX // MUST be always the last in the list } USER_ITEM;