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

add zapit start channel menu

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 858b73f023
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-02-21 (Mon, 21 Feb 2011)

Origin message was:
------------------
-add zapit start channel menu

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


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2011-02-21 12:27:06 +00:00
parent c56e8cf2ea
commit b1965b5fbd
10 changed files with 89 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/neutrino.cpp
View File

@@ -801,6 +801,15 @@ printf("***************************** rec dir %s timeshift dir %s\n", g_settings
if ((g_settings.filebrowser_sortmethod < 0) || (g_settings.filebrowser_sortmethod >= FILEBROWSER_NUMBER_OF_SORT_VARIANTS))
g_settings.filebrowser_sortmethod = 0;
g_settings.filebrowser_denydirectoryleave = configfile.getBool("filebrowser_denydirectoryleave", false);
//zapit setup
g_settings.StartChannelTV = configfile.getString("startchanneltv","");
g_settings.StartChannelRadio = configfile.getString("startchannelradio","");
g_settings.startchanneltv_id = configfile.getInt64("startchanneltv_id", 0);
g_settings.startchannelradio_id = configfile.getInt64("startchannelradio_id", 0);
g_settings.startchanneltv_nr = configfile.getInt32("startchanneltv_nr", 0);
g_settings.startchannelradio_nr = configfile.getInt32("startchannelradio_nr", 0);
g_settings.uselastchannel = configfile.getInt32("uselastchannel" , 1);
// USERMENU -> in system/settings.h
//-------------------------------------------
@@ -1302,6 +1311,15 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("filebrowser_sortmethod", g_settings.filebrowser_sortmethod);
configfile.setBool("filebrowser_denydirectoryleave", g_settings.filebrowser_denydirectoryleave);
//zapit setup
configfile.setString( "startchanneltv", g_settings.StartChannelTV );
configfile.setString( "startchannelradio", g_settings.StartChannelRadio );
configfile.setInt64("startchanneltv_id", g_settings.startchanneltv_id);
configfile.setInt64("startchannelradio_id", g_settings.startchannelradio_id);
configfile.setInt32("startchanneltv_nr", g_settings.startchanneltv_nr);
configfile.setInt32("startchannelradio_nr", g_settings.startchannelradio_nr);
configfile.setInt32("uselastchannel", g_settings.uselastchannel);
// USERMENU
//---------------------------------------
char txt1[81];
@@ -2066,7 +2084,16 @@ int CNeutrinoApp::run(int argc, char **argv)
CVFD::getInstance()->Clear();
CVFD::getInstance()->ShowText((char *) g_Locale->getText(LOCALE_NEUTRINO_STARTING));
pthread_create (&zapit_thread, NULL, zapit_main_thread, (void *) g_settings.video_Mode);
//zapit start parameters
Z_start_arg ZapStart_arg;
ZapStart_arg.startchanneltv_id = g_settings.startchanneltv_id;
ZapStart_arg.startchannelradio_id = g_settings.startchannelradio_id;
ZapStart_arg.startchanneltv_nr = g_settings.startchanneltv_nr;
ZapStart_arg.startchannelradio_nr = g_settings.startchannelradio_nr;
ZapStart_arg.uselastchannel = g_settings.uselastchannel;
ZapStart_arg.video_mode = g_settings.video_Mode;
pthread_create (&zapit_thread, NULL, zapit_main_thread, (void *) &ZapStart_arg);
audioSetupNotifier = new CAudioSetupNotifier;
while(!zapit_ready)