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 menu for led record

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


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

Origin message was:
------------------
-add menu for led record

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


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2011-02-07 18:53:26 +00:00
parent aaa2ee6961
commit 5875f88614
9 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -664,6 +664,7 @@ lcdmenu.statusline.volume Lautstärke
ledcontroler.menu Power Button LEDs
ledcontroler.mode.tv TV Betrieb
ledcontroler.mode.deepstandby Deep-Standby
ledcontroler.mode.record Blinke bei Aufnahme
ledcontroler.mode.standby Standby
ledcontroler.off LED1 & LED2 aus
ledcontroler.on.all LED1 & LED2 an

1
data/locale/english.locale
View File

@@ -499,6 +499,7 @@ lcdmenu.statusline.volume volume
ledcontroler.menu Power Button LED<45>s
ledcontroler.mode.tv TV Mode
ledcontroler.mode.deepstandby Deep Standby
ledcontroler.mode.record Blinke in Record
ledcontroler.mode.standby Standby
ledcontroler.off Led1 & Led2 off
ledcontroler.on.all Led1 & Led2 on

33
src/driver/vfd.cpp
View File

@@ -176,11 +176,38 @@ void CVFD::setled(int led1, int led2){
perror("IOC_VFD_LED_CTRL");
}
void CVFD::setled(bool on_off)
{
if(g_settings.led_rec_mode == 0)
return;
int led1 = VFD_LED_1_OFF, led2 = VFD_LED_2_OFF;
if(on_off){//on
switch(g_settings.led_rec_mode){
case 1:
led1 = VFD_LED_1_ON; led2 = VFD_LED_2_ON;
break;
case 2:
led1 = VFD_LED_1_ON; led2 = VFD_LED_2_OFF;
break;
case 3:
led1 = VFD_LED_1_OFF; led2 = VFD_LED_2_ON;
break;
default:
break;
}
}
else {//off
led1 = VFD_LED_1_OFF; led2 = VFD_LED_2_OFF;
}
setled(led1, led2);
}
void CVFD::setled(void)
{
if(!has_lcd) return;
int led1 = 0, led2 = 0;
int led1 = VFD_LED_1_OFF, led2 = VFD_LED_2_OFF;
int select = 0;
if(mode == MODE_MENU_UTF8 || mode == MODE_TVRADIO )
@@ -255,12 +282,12 @@ void CVFD::showTime(bool force)
clearClock = 0;
if(has_lcd)
ShowIcon(VFD_ICON_CAM1, false);
setled(VFD_LED_1_OFF, VFD_LED_2_OFF);
setled(false);//off
} else {
clearClock = 1;
if(has_lcd)
ShowIcon(VFD_ICON_CAM1, true);
setled(VFD_LED_1_ON, VFD_LED_2_ON);
setled(true);//on
}
} else if(clearClock || (recstatus != CNeutrinoApp::getInstance ()->recordingstatus)) { // in case icon ON after record stopped
clearClock = 0;

1
src/driver/vfd.h
View File

@@ -104,6 +104,7 @@ class CVFD
bool has_lcd;
void setlcdparameter(void);
void setled(void);
void setled(bool on_off);
static CVFD* getInstance();
void init(const char * fontfile, const char * fontname);

1
src/gui/vfd_setup.cpp
View File

@@ -127,6 +127,7 @@ void CVfdSetup::showSetup()
ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_TV, &g_settings.led_tv_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true, new CLedControlNotifier()));
ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_STANDBY, &g_settings.led_standby_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true));
ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_DEEPSTANDBY, &g_settings.led_deep_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true));
ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_RECORD, &g_settings.led_rec_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true));
ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_BLINK, &g_settings.led_blink, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
vfds->addItem(new CMenuForwarder(LOCALE_LEDCONTROLER_MENU, true, NULL, ledMenu, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
}

2
src/neutrino.cpp
View File

@@ -462,6 +462,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.led_tv_mode = configfile.getInt32( "led_tv_mode", 1);
g_settings.led_standby_mode = configfile.getInt32( "led_standby_mode", 1);
g_settings.led_deep_mode = configfile.getInt32( "led_deep_mode", 1);
g_settings.led_rec_mode = configfile.getInt32( "led_rec_mode", 1);
g_settings.led_blink = configfile.getInt32( "led_blink", 1);
g_settings.hdd_fs = configfile.getInt32( "hdd_fs", 0);
@@ -999,6 +1000,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "led_tv_mode", g_settings.led_tv_mode);
configfile.setInt32( "led_standby_mode", g_settings.led_standby_mode);
configfile.setInt32( "led_deep_mode", g_settings.led_deep_mode);
configfile.setInt32( "led_rec_mode", g_settings.led_rec_mode);
configfile.setInt32( "led_blink", g_settings.led_blink);
//misc

1
src/system/locals.h
View File

@@ -533,6 +533,7 @@ typedef enum {
LOCALE_LEDCONTROLER_MENU,
LOCALE_LEDCONTROLER_MODE_TV,
LOCALE_LEDCONTROLER_MODE_DEEPSTANDBY,
LOCALE_LEDCONTROLER_MODE_RECORD,
LOCALE_LEDCONTROLER_MODE_STANDBY,
LOCALE_LEDCONTROLER_OFF,
LOCALE_LEDCONTROLER_ON_ALL,

1
src/system/locals_intern.h
View File

@@ -533,6 +533,7 @@ const char *locale_real_names[] = {
"ledcontroler.menu",
"ledcontroler.mode.tv",
"ledcontroler.mode.deepstandby",
"ledcontroler.mode.record",
"ledcontroler.mode.standby",
"ledcontroler.off",
"ledcontroler.on.all",

1
src/system/settings.h
View File

@@ -397,6 +397,7 @@ struct SNeutrinoSettings
int led_tv_mode;
int led_standby_mode;
int led_deep_mode;
int led_rec_mode;
int led_blink;
#define FILESYSTEM_ENCODING_TO_UTF8(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a).c_str())
#define UTF8_TO_FILESYSTEM_ENCODING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::UTF8_to_Latin1(a).c_str())