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

add cam,boxinfo,imageinfo to user menu

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 629bf8783d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-10-15 (Fri, 15 Oct 2010)

Origin message was:
------------------
-add cam,boxinfo,imageinfo to user menu

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


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-10-15 17:08:50 +00:00
parent c01b8432d6
commit ade9fb2751
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/movieplayer.cpp
View File

@@ -192,6 +192,7 @@ void CMoviePlayerGui::Init(void)
tsfilefilter.addFilter("mpv"); tsfilefilter.addFilter("mpv");
tsfilefilter.addFilter("vob"); tsfilefilter.addFilter("vob");
tsfilefilter.addFilter("m2ts"); tsfilefilter.addFilter("m2ts");
tsfilefilter.addFilter("mp4");
vlcfilefilter.addFilter("mpg"); vlcfilefilter.addFilter("mpg");

21
src/neutrino_menue.cpp
View File

@@ -3359,6 +3359,27 @@ bool CNeutrinoApp::showUserMenu(int button)
menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, StreamFeaturesChanger, "teletext", key, icon); menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, StreamFeaturesChanger, "teletext", key, icon);
menu->addItem(menu_item, 0); menu->addItem(menu_item, 0);
break; 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 #if 0 // FIXME not supported yet
case SNeutrinoSettings::ITEM_MOVIEPLAYER_TS: case SNeutrinoSettings::ITEM_MOVIEPLAYER_TS:

4
src/system/setting_helpers.cpp
View File

@@ -858,6 +858,10 @@ const CMenuOptionChooser::keyval USERMENU_ITEM_OPTIONS[USERMENU_ITEM_OPTION_COUN
{ SNeutrinoSettings::ITEM_TECHINFO, LOCALE_EPGMENU_STREAMINFO }, { SNeutrinoSettings::ITEM_TECHINFO, LOCALE_EPGMENU_STREAMINFO },
{ SNeutrinoSettings::ITEM_PLUGIN, LOCALE_TIMERLIST_PLUGIN }, { SNeutrinoSettings::ITEM_PLUGIN, LOCALE_TIMERLIST_PLUGIN },
{ SNeutrinoSettings::ITEM_VTXT, LOCALE_USERMENU_ITEM_VTXT }, { 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 #if 0
{ SNeutrinoSettings::ITEM_MOVIEPLAYER_TS, LOCALE_MAINMENU_MOVIEPLAYER } , { SNeutrinoSettings::ITEM_MOVIEPLAYER_TS, LOCALE_MAINMENU_MOVIEPLAYER } ,
{ SNeutrinoSettings::ITEM_RESTART_CAMD, LOCALE_EXTRA_RESTARTCAMD } { SNeutrinoSettings::ITEM_RESTART_CAMD, LOCALE_EXTRA_RESTARTCAMD }

7
src/system/settings.h
View File

@@ -483,9 +483,12 @@ struct SNeutrinoSettings
ITEM_TECHINFO = 13, ITEM_TECHINFO = 13,
ITEM_REMOTE = 14, ITEM_REMOTE = 14,
ITEM_PLUGIN = 15, ITEM_PLUGIN = 15,
ITEM_IMAGEINFO,
ITEM_BOXINFO,
ITEM_CAM,
#if 0 #if 0
ITEM_MOVIEPLAYER_TS = 16, ITEM_MOVIEPLAYER_TS,
ITEM_RESTART_CAMD = 17, ITEM_RESTART_CAMD,
#endif #endif
ITEM_MAX // MUST be always the last in the list ITEM_MAX // MUST be always the last in the list
} USER_ITEM; } USER_ITEM;