Merge branch 'master' into multituner

This commit is contained in:
[CST] Focus
2012-01-16 17:48:19 +04:00
20 changed files with 277 additions and 97 deletions

View File

@@ -379,7 +379,16 @@ struct SNeutrinoSettings
int cacheTXT;
int minimode;
int mode_clock;
int virtual_zap_mode;
enum MODE_LEFT_RIGHT_KEY_TV_SETTINGS
{
ZAP = 0,
VZAP = 1,
VOLUME = 2,
INFOBAR = 3
};
int mode_left_right_key_tv;
int spectrum;
int pip_width;
int pip_height;