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

network menu (#264)

Browse Source 
- tune timeout (#266)
- satfinder (#269)
- tuxtxt:
	new monospace font to support more languages
	option to select teletext font
	charset selection from pmt
	more menu languages from tuxbox cvs
	cleanup sutitiles start screen
needs testing.
	


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


Origin commit data
------------------
Branch: ni/coolstream
Commit: ba1f0ceb83
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-03-15 (Mon, 15 Mar 2010)

Origin message was:
------------------
- network menu (#264)
- tune timeout (#266)
- satfinder (#269)
- tuxtxt:
	new monospace font to support more languages
	option to select teletext font
	charset selection from pmt
	more menu languages from tuxbox cvs
	cleanup sutitiles start screen
needs testing.
	


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


------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-03-15 20:49:03 +00:00
parent eec6deffdb
commit be138c7686
22 changed files with 715 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/neutrino.cpp
View File

@@ -725,6 +725,8 @@ const lcd_setting_struct_t lcd_setting[LCD_SETTING_COUNT] =
#define DEFAULT_Y_START 20
#define DEFAULT_X_END 1220
#define DEFAULT_Y_END 560
std::string ttx_font_file = "";
int CNeutrinoApp::loadSetup(const char * fname)
{
char cfg_key[81];
@@ -1064,6 +1066,8 @@ printf("***************************** rec dir %s timeshift dir %s\n", g_settings
strcpy(g_settings.softupdate_proxypassword, configfile.getString("softupdate_proxypassword", "" ).c_str());
//
strcpy( g_settings.font_file, configfile.getString( "font_file", FONTDIR"/neutrino.ttf" ).c_str() );
strcpy( g_settings.ttx_font_file, configfile.getString( "ttx_font_file", FONTDIR"/DejaVuLGCSansMono-Bold.ttf" ).c_str() );
ttx_font_file = g_settings.ttx_font_file;
strcpy( g_settings.update_dir, configfile.getString( "update_dir", "/tmp" ).c_str() );
//BouquetHandling
g_settings.bouquetlist_mode = configfile.getInt32( "bouquetlist_mode", 0 );
@@ -1554,6 +1558,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
#endif
configfile.setString("update_dir", g_settings.update_dir);
configfile.setString("font_file", g_settings.font_file);
configfile.setString("ttx_font_file", g_settings.ttx_font_file);
//BouquetHandling
configfile.setInt32( "bouquetlist_mode", g_settings.bouquetlist_mode );
@@ -3600,6 +3605,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN);
dprintf(DEBUG_INFO, "exit\n");
StopSubtitles();
g_Zapit->stopPlayBack();
frameBuffer->paintBackground();
@@ -4147,6 +4153,7 @@ printf("CNeutrinoApp::startNextRecording: start to dir %s\n", recordingDir);
* CNeutrinoApp - exec, menuitem callback (shutdown) *
**************************************************************************************/
void SaveMotorPositions();
int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
{
// printf("ac: %s\n", actionKey.c_str());
@@ -4427,6 +4434,20 @@ printf("New timeshift dir: %s\n", timeshiftDir);
}
return menu_return::RETURN_REPAINT;
}
else if(actionKey == "ttx_font") {
parent->hide();
CFileBrowser fileBrowser;
CFileFilter fileFilter;
fileFilter.addFilter("ttf");
fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec(FONTDIR) == true) {
strcpy(g_settings.ttx_font_file, fileBrowser.getSelectedFile()->Name.c_str());
ttx_font_file = fileBrowser.getSelectedFile()->Name;
printf("[neutrino] ttx font file %s\n", fileBrowser.getSelectedFile()->Name.c_str());
SetupFonts();
}
return menu_return::RETURN_REPAINT;
}
else if(actionKey == "movieplugin") {
parent->hide();
CMenuWidget MoviePluginSelector(LOCALE_MOVIEPLAYER_DEFPLUGIN, NEUTRINO_ICON_FEATURES);
@@ -4961,7 +4982,7 @@ void CNeutrinoApp::SelectSubtitles()
int page = ((sd->teletext_magazine_number & 0xFF) << 8) | sd->teletext_page_number;
printf("CNeutrinoApp::SelectSubtitles: found TTX %s, pid %x page %03X\n", sd->ISO639_language_code.c_str(), sd->pId, page);
tuxtx_stop_subtitle();
tuxtx_set_pid(sd->pId, page);
tuxtx_set_pid(sd->pId, page, (char *) sd->ISO639_language_code.c_str());
return;
}
}