diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 497db425e..87fce3fd3 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -5,9 +5,10 @@ audio.srs_algo Art audio.srs_algo_light einfach audio.srs_algo_normal normal audio.srs_iq SRS TruVolume Technologie -audio.srs_nmgr Noise-Manager +audio.srs_nmgr Noise-Manager audio.srs_volume Referenzlautstärke -audiomenu.analogout Analog-Ausgang +audiomenu.analog_mode Analog Modus +audiomenu.analog_out Analog-Ausgang audiomenu.avs avs audiomenu.avs_control Volume Steuerung avs/ost audiomenu.avsync A/V sync @@ -93,10 +94,10 @@ bouqueteditor.switch Kanal aufnehmen/ entfernen bouqueteditor.switchmode TV/ Radio bouquetlist.head Bouquets cablesetup.provider Kabelanbieter -cam.empty Kein CAM im Slot -cam.init_ok CAM-Init beendet -> -cam.inserted CAM im Slot -cam.removed CAM entfernt -> Slot +cam.empty Kein CAM im Slot +cam.init_ok CAM-Init beendet -> +cam.inserted CAM im Slot +cam.removed CAM entfernt -> Slot cam.settings Common Interface cam.timeout CAM antwortet nicht cam.waiting Warte auf CAM-Antwort @@ -258,7 +259,7 @@ extra.dvbsnoop_sdt Zeige SDT extra.dvbsnoop_sit Zeige SIT extra.dvbsnoop_tdt Zeige TDT extra.dvbsnoop_tsdt Zeige TSDT -extra.east Osten +extra.east Osten extra.english Englisch extra.fec_1_2 1/2 S1_Q extra.fec_2_3 2/3 S1_Q @@ -304,7 +305,7 @@ extra.logview Log anzeigen extra.longitude Längengrad extra.manual_scan Manueller Scan extra.menu_left_exit "links" = Menü zurück -extra.north Norden +extra.north Norden extra.record_time Timeshift Aufnahmezeit in Stunden extra.rotor_swap Rotor dreht Ost/ West extra.save_settings Einstellungen speichern @@ -334,7 +335,7 @@ extra.tp_mod_64 QAM/64 extra.tp_pol Polarization extra.tp_pol_h H extra.tp_rate Symbolrate -extra.update_dir Update-Verzeichnis +extra.update_dir Update-Verzeichnis extra.use_gotoxx Benutze gotoXX extra.use_log Logge nach /tmp/log extra.valid gültig @@ -343,7 +344,7 @@ extra.zap_cycle Zap nur in Bouquet extra.zapit_backup Sichere Kanalliste nach /tmp extra.zapit_delete Lösche Kanal extra.zapit_fast_zap Schnellumschaltung -extra.zapit_fe_timeout Tunen fehlgeschlagen +extra.zapit_fe_timeout Tunen fehlgeschlagen extra.zapit_hvoltage High (13.5/ 18.5) Voltage extra.zapit_make_bouquet Kanalliste auffüllen extra.zapit_menu Zapit-Einstellungen @@ -441,7 +442,7 @@ flashupdate.url_file Konfigfile flashupdate.versioncheck Versionsüberprüfung flashupdate.writeflash ganzes Flashimage einspielen flashupdate.writeflashmtd einzelne Partition einspielen -flashupdate.wrongbase Abweichende Release-Information\nFortfahren? +flashupdate.wrongbase Abweichende Release-Information\nFortfahren? fontmenu.channellist Kanalliste fontmenu.epg EPG (Programmführer) fontmenu.eventlist Event-Liste @@ -570,7 +571,7 @@ hdd_noise Akustik-Einstellung hdd_not_found Keine Festplatte hdd_reiser Reiserfs hdd_settings Festplatteneinstellungen -hdd_sleep Motorstopp nach +hdd_sleep Motorstopp nach hdd_slow Langsam hdd_umount_warn unmout des Laufwerks imageinfo.creator Ersteller: @@ -634,7 +635,7 @@ keychoosermenu.setnew Neue Taste einstellen keychoosermenu.setnone Keine Taste languagesetup.head Spracheinstellungen languagesetup.select Sprache -lcdcontroler.brightness normale Helligkeit +lcdcontroler.brightness normale Helligkeit lcdcontroler.brightnessstandby Standby Helligkeit lcdcontroler.contrast Kontrast lcdcontroler.head VFD Einstellungen @@ -701,7 +702,7 @@ miscsettings.epg_cache_hint1 EPG-Daten im Voraus zwischenspeichern? miscsettings.epg_cache_hint2 (Angabe in Tagen) miscsettings.epg_dir EPG Speicherverzeichnis miscsettings.epg_extendedcache Sendungsbeschr. behalten (Std.) -miscsettings.epg_extendedcache_hint1 Dauer für die Zwischenspeicherung der +miscsettings.epg_extendedcache_hint1 Dauer für die Zwischenspeicherung der miscsettings.epg_extendedcache_hint2 Sendungsbeschreibung (Angabe in Stunden) miscsettings.epg_head EPG Einstellungen miscsettings.epg_max_events Max. Events @@ -790,7 +791,7 @@ moviebrowser.edit_book Bookmark Ändern moviebrowser.edit_book_name_info1 Neuer Markierungsname moviebrowser.edit_book_name_info2 book name info2 moviebrowser.edit_book_pos_info1 Neue Position (s) -moviebrowser.edit_book_pos_info2 +moviebrowser.edit_book_pos_info2 moviebrowser.edit_book_type_info1 Neue Sprunglänge (s) moviebrowser.edit_book_type_info2 <0 zurück , >0 vor, 0: kein moviebrowser.edit_serie Name der Serie @@ -805,7 +806,7 @@ moviebrowser.head_recordlist Zuletzt aufgenommen: moviebrowser.hide_series Verstecke Serien moviebrowser.hint_jumpbackward Rücksprung in 5 s\n '0' zum Weitersehen moviebrowser.hint_jumpforward Werbung überspringen in 5 s\n '0' zum Ansehen -moviebrowser.hint_movieend Filmende in 5 s\n '0' zum Weitersehen +moviebrowser.hint_movieend Filmende in 5 s\n '0' zum Weitersehen moviebrowser.hint_newbook_backward Neue Wiederholung\n 'blue' für Endposition moviebrowser.hint_newbook_forward Neuer Werbesprung\n 'blue' für Endposition moviebrowser.info_audio Audio @@ -824,7 +825,7 @@ moviebrowser.info_parental_lockage_12year 12 Jahre moviebrowser.info_parental_lockage_16year 16 Jahre moviebrowser.info_parental_lockage_18year 18 Jahre moviebrowser.info_parental_lockage_6year 6 Jahre -moviebrowser.info_parental_lockage_always nie +moviebrowser.info_parental_lockage_always nie moviebrowser.info_path Verzeichnis moviebrowser.info_prevplaydate Letzte Wiedergabe moviebrowser.info_prodcountry Land @@ -890,7 +891,7 @@ moviebrowser.use_rec_dir Aufnahmeverzeichnis verwenden movieplayer.bookmark Bookmarks movieplayer.bookmarkname Bookmark Name movieplayer.bookmarkname_hint1 Geben Sie den Namen für das neue Bookmark ein -movieplayer.bookmarkname_hint2 +movieplayer.bookmarkname_hint2 movieplayer.buffering Puffern... movieplayer.defdir Start-Verz. movieplayer.defplugin Start-Plugin @@ -904,32 +905,32 @@ movieplayer.nostreamingserver Es konnte keine Verbindung\nzum Streamingserver he movieplayer.pesplayback PES Abspielen (experimentell) movieplayer.pleasewait Bitte warten Sie.\nDie Verbindung zum Streamingserver wird hergestellt. movieplayer.toomanybookmarks Sie haben bereits zu viele Bookmarks angelegt.\nEs muß erst ein anderes gelöscht werden. -movieplayer.tshelp1 Stopp -movieplayer.tshelp10 ca. 10 Minuten zurück -movieplayer.tshelp11 ca. 10 Minuten vor -movieplayer.tshelp12 Hilfe: http://www.giggo.de/dbox2/movieplayer.html\n -movieplayer.tshelp2 Auswahl der Tonspur -movieplayer.tshelp3 Pause/ Weiter -movieplayer.tshelp4 Bookmark setzen -movieplayer.tshelp5 Zeit einblenden -movieplayer.tshelp6 ca. 1 Minute zurück -movieplayer.tshelp7 ca. 1 Minute vor -movieplayer.tshelp8 ca. 5 Minuten zurück -movieplayer.tshelp9 ca. 5 Minuten vor +movieplayer.tshelp1 Stopp +movieplayer.tshelp10 ca. 10 Minuten zurück +movieplayer.tshelp11 ca. 10 Minuten vor +movieplayer.tshelp12 Hilfe: http://www.giggo.de/dbox2/movieplayer.html\n +movieplayer.tshelp2 Auswahl der Tonspur +movieplayer.tshelp3 Pause/ Weiter +movieplayer.tshelp4 Bookmark setzen +movieplayer.tshelp5 Zeit einblenden +movieplayer.tshelp6 ca. 1 Minute zurück +movieplayer.tshelp7 ca. 1 Minute vor +movieplayer.tshelp8 ca. 5 Minuten zurück +movieplayer.tshelp9 ca. 5 Minuten vor movieplayer.tsplayback TS Abspielen movieplayer.vcdplayback (S)VCD -movieplayer.vlchelp1 Stopp -movieplayer.vlchelp10 ca. 10 Minuten zurück -movieplayer.vlchelp11 ca. 10 Minuten vor -movieplayer.vlchelp12 Hilfe: http://www.giggo.de/dbox2/movieplayer.html\n -movieplayer.vlchelp2 Resync -movieplayer.vlchelp3 Pause/ Weiter -movieplayer.vlchelp4 Bookmark setzen -movieplayer.vlchelp5 Zeit einblenden -movieplayer.vlchelp6 ca. 1 Minute zurück -movieplayer.vlchelp7 ca. 1 Minute vor -movieplayer.vlchelp8 ca. 5 Minuten zurück -movieplayer.vlchelp9 ca. 5 Minuten vor +movieplayer.vlchelp1 Stopp +movieplayer.vlchelp10 ca. 10 Minuten zurück +movieplayer.vlchelp11 ca. 10 Minuten vor +movieplayer.vlchelp12 Hilfe: http://www.giggo.de/dbox2/movieplayer.html\n +movieplayer.vlchelp2 Resync +movieplayer.vlchelp3 Pause/ Weiter +movieplayer.vlchelp4 Bookmark setzen +movieplayer.vlchelp5 Zeit einblenden +movieplayer.vlchelp6 ca. 1 Minute zurück +movieplayer.vlchelp7 ca. 1 Minute vor +movieplayer.vlchelp8 ca. 5 Minuten zurück +movieplayer.vlchelp9 ca. 5 Minuten vor movieplayer.wrongvlcversion Funktion ist mit der benutzten Version des VLC nicht möglich mpkey.audio Audiotrack mpkey.bookmark Speichere Bookmark @@ -1054,7 +1055,7 @@ pinprotection.wrongcode Geben Sie den Code nocheinmal ein! plugins.result Pluginausgabe progressbar.color Fortschrittsbalken farbe rclock.lockmsg Die Fernbedienung der Coolstream wird gesperrt.\n Um die Sperre aufzuheben, bitte\n und auf der Fernbedienung\n drücken. -rclock.menueadd FB sperren +rclock.menueadd FB sperren rclock.title Fernbedienung sperren rclock.unlockmsg Fernbedienung reaktiviert... recordingmenu.apids Voreinstellung für Tonspuren @@ -1096,7 +1097,7 @@ repeatblocker.hint_2 0 schaltet den Blocker aus (Rot ist " ") reset_all Werkseinstellungen zurücksetzen reset_channels Lösche Kanäle reset_confirm Sind Sie sich sicher? -reset_settings Zurück auf Werkseinstellungen +reset_settings Zurück auf Werkseinstellungen rfmod.carrier Unterträger-Frequenz rfmod.carrier4500 4.5 rfmod.carrier5500 5.5 @@ -1108,7 +1109,7 @@ rfmod.finetune Feintuning rfmod.rfmod RF Modulator rfmod.standby Modulator aktivieren rfmod.test Testbild -satsetup.auto_scan Ausgewählten Satelliten scannen +satsetup.auto_scan Ausgewählten Satelliten scannen satsetup.auto_scan_all Alle Satelliten scannen satsetup.comm_input Committed Input satsetup.diseqc DiSEqC @@ -1136,8 +1137,9 @@ satsetup.sat_setup Setup LNB-Konfiguration satsetup.satellite Satellit satsetup.savesettingsnow Einstellungen jetzt speichern satsetup.smatvremote SMATV Remote Tuning -satsetup.uncomm_input Uncommitted +satsetup.uncomm_input Uncommitted satsetup.usals_repeat USALS wiederholen +satsetup.use_fta_flag nur freie Kanäle satsetup.use_nit Auswertung NIT satsetup.use_usals Benutze USALS scants.abort_body Scanvorgang wirklich abbrechen? @@ -1183,10 +1185,10 @@ servicemenu.update Software-Aktualisierung settings.help Hilfe settings.missingoptionsconffile Die Neutrino-Einstellungen wurden erweitert.\nDie neuen Werte werden auf Standard gesetzt. settings.noconffile Die Neutrino-Einstellungen wurden nicht\ngefunden. Es werden Standardwerte benutzt. -settings.pos_bottom_left unten links -settings.pos_bottom_right unten rechts -settings.pos_top_left oben links -settings.pos_top_right oben rechts +settings.pos_bottom_left unten links +settings.pos_bottom_right unten rechts +settings.pos_top_left oben links +settings.pos_top_right oben rechts shutdown.recoding_query Aufnahme läuft. Trotzdem beenden? shutdowntimer.announce Die Box wird in 1 min runtergefahren.\nShutdown abbrechen? sleeptimerbox.announce Sleeptimer in 1 min @@ -1335,7 +1337,7 @@ usermenu.button_yellow Benutzermenü 'gelb' usermenu.head Benutzermenü usermenu.item_bar ---- Trennung ---- usermenu.item_epg_misc EPG Funktionen -usermenu.item_none +usermenu.item_none usermenu.item_vtxt Teletext usermenu.name Name video_mode_ok Video-Einstellungen ok ? diff --git a/data/locale/english.locale b/data/locale/english.locale index 9ec4accd1..6eb7bd08c 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -3,7 +3,7 @@ EPGMenu.eventinfo Details current program EPGMenu.eventlist Eventlist current programm EPGMenu.head EPG - Program Information EPGMenu.streaminfo technical information -EPGPlus.actions Actions +EPGPlus.actions Actions EPGPlus.bybouquet_mode by bouquet EPGPlus.bypage_mode by page EPGPlus.change_font_size font size @@ -351,7 +351,7 @@ flashupdate.url_file config file flashupdate.versioncheck checking version flashupdate.writeflash Write whole image flashupdate.writeflashmtd Write one partition -flashupdate.wrongbase Your Release cycle differs.\nTo continue? +flashupdate.wrongbase Your Release cycle differs.\nTo continue? fontmenu.channellist Channellist fontmenu.epg EPG fontmenu.eventlist Eventlist @@ -514,7 +514,7 @@ motorcontrol.head Satellite finder movieplayer.bookmark Bookmarks movieplayer.bookmarkname Bookmarkname movieplayer.bookmarkname_hint1 Enter a name for your new bookmark -movieplayer.bookmarkname_hint2 +movieplayer.bookmarkname_hint2 movieplayer.buffering Buffering... movieplayer.defdir start dir. movieplayer.defplugin Start-Plugin @@ -528,32 +528,32 @@ movieplayer.nostreamingserver The streaming server could not be reached. movieplayer.pesplayback Play PES (Experimental) movieplayer.pleasewait Please wait.\nConnecting to the streaming server... movieplayer.toomanybookmarks There are too many bookmarks.\nYou need to delete one of them first. -movieplayer.tshelp1 Stop -movieplayer.tshelp10 approx. 10 minutes back -movieplayer.tshelp11 skip approx. 10 minutes -movieplayer.tshelp12 Help: http://www.giggo.de/dbox2/movieplayer.html\n -movieplayer.tshelp2 Select audio track -movieplayer.tshelp3 Pause/Continue -movieplayer.tshelp4 Create bookmark -movieplayer.tshelp5 Show progress -movieplayer.tshelp6 approx. 1 minute back -movieplayer.tshelp7 skip approx. 1 minute -movieplayer.tshelp8 approx. 5 minutes back -movieplayer.tshelp9 skip approx. 5 minutes +movieplayer.tshelp1 Stop +movieplayer.tshelp10 approx. 10 minutes back +movieplayer.tshelp11 skip approx. 10 minutes +movieplayer.tshelp12 Help: http://www.giggo.de/dbox2/movieplayer.html\n +movieplayer.tshelp2 Select audio track +movieplayer.tshelp3 Pause/Continue +movieplayer.tshelp4 Create bookmark +movieplayer.tshelp5 Show progress +movieplayer.tshelp6 approx. 1 minute back +movieplayer.tshelp7 skip approx. 1 minute +movieplayer.tshelp8 approx. 5 minutes back +movieplayer.tshelp9 skip approx. 5 minutes movieplayer.tsplayback Play TS movieplayer.vcdplayback (S)VCD -movieplayer.vlchelp1 Stop -movieplayer.vlchelp10 approx. 10 minutes back -movieplayer.vlchelp11 skip approx. 10 minutes -movieplayer.vlchelp12 Help: http://www.giggo.de/dbox2/movieplayer.html\n -movieplayer.vlchelp2 Resync -movieplayer.vlchelp3 Pause/Continue -movieplayer.vlchelp4 Create bookmark -movieplayer.vlchelp5 Show progress -movieplayer.vlchelp6 approx. 1 minute back -movieplayer.vlchelp7 skip approx. 1 minute -movieplayer.vlchelp8 approx. 5 minutes back -movieplayer.vlchelp9 skip approx. 5 minutes +movieplayer.vlchelp1 Stop +movieplayer.vlchelp10 approx. 10 minutes back +movieplayer.vlchelp11 skip approx. 10 minutes +movieplayer.vlchelp12 Help: http://www.giggo.de/dbox2/movieplayer.html\n +movieplayer.vlchelp2 Resync +movieplayer.vlchelp3 Pause/Continue +movieplayer.vlchelp4 Create bookmark +movieplayer.vlchelp5 Show progress +movieplayer.vlchelp6 approx. 1 minute back +movieplayer.vlchelp7 skip approx. 1 minute +movieplayer.vlchelp8 approx. 5 minutes back +movieplayer.vlchelp9 skip approx. 5 minutes movieplayer.wrongvlcversion This feature is not support by your current version of VLC networkmenu.broadcast Broadcast networkmenu.dhcp DHCP @@ -665,7 +665,7 @@ pinprotection.wrongcode PIN-Code was wrong! Try again. plugins.result plugin output progressbar.color Progressbar Color rclock.lockmsg Your box remote control will be locked.\n To unlock it, press \n and on your remote control. -rclock.menueadd Lock RC +rclock.menueadd Lock RC rclock.title Lock Remote Control rclock.unlockmsg Remote control reactivated. recordingmenu.choose_direct_rec_dir choose dir on imm. recording @@ -835,9 +835,9 @@ timerlist.repeat.unknown unknown timerlist.repeat.wednesday We timerlist.repeat.weekdays on weekdays timerlist.repeat.weekly weekly -timerlist.repeatcount repeats -timerlist.repeatcount.help1 amount of timer repeats -timerlist.repeatcount.help2 0 for unlimited repeats +timerlist.repeatcount repeats +timerlist.repeatcount.help1 amount of timer repeats +timerlist.repeatcount.help2 0 for unlimited repeats timerlist.save Save timer timerlist.standby SB mode timerlist.standby.off Leave standby @@ -1082,10 +1082,10 @@ moviebrowser.book_type Jump (<0 back , >0 for): moviebrowser.book_type_backward Repeat moviebrowser.book_type_forward jump over moviebrowser.edit_book Bookmark change -moviebrowser.edit_book_name_info1 Enter new Bookmark name +moviebrowser.edit_book_name_info1 Enter new Bookmark name moviebrowser.edit_book_name_info2 moviebrowser.edit_book_pos_info1 Enter new Position (s) -moviebrowser.edit_book_pos_info2 +moviebrowser.edit_book_pos_info2 moviebrowser.edit_book_type_info1 Enter new jump length (s) moviebrowser.edit_book_type_info2 <0 back , >0 for, 0: none moviebrowser.edit_serie Enter name of serie @@ -1097,11 +1097,11 @@ moviebrowser.head TS MovieBrowser moviebrowser.head_filter Filter movies by category: moviebrowser.head_playlist Last played: moviebrowser.head_recordlist Last recorded: -moviebrowser.hint_jumpbackward Jump back in 5 s\n '0' to cancel -moviebrowser.hint_jumpforward Jump forward in 5 s\n '0' to cancel -moviebrowser.hint_movieend Filmende in 5 s\n '0' zum weitersehen -moviebrowser.hint_newbook_backward New jump back\n 'blue' for endposition -moviebrowser.hint_newbook_forward New jump forward\n 'blue' for endposition +moviebrowser.hint_jumpbackward Jump back in 5 s\n '0' to cancel +moviebrowser.hint_jumpforward Jump forward in 5 s\n '0' to cancel +moviebrowser.hint_movieend Filmende in 5 s\n '0' zum weitersehen +moviebrowser.hint_newbook_backward New jump back\n 'blue' for endposition +moviebrowser.hint_newbook_forward New jump forward\n 'blue' for endposition moviebrowser.info_audio Audio moviebrowser.info_channel Channel moviebrowser.info_filename Name @@ -1116,7 +1116,7 @@ moviebrowser.info_parental_lockage_12year 12 years moviebrowser.info_parental_lockage_16year 16 years moviebrowser.info_parental_lockage_18year 18 years moviebrowser.info_parental_lockage_6year 6 years -moviebrowser.info_parental_lockage_always never +moviebrowser.info_parental_lockage_always never moviebrowser.info_path Path moviebrowser.info_prevplaydate Last play date moviebrowser.info_prodcountry Country @@ -1277,6 +1277,7 @@ satsetup.motor_pos Rotor position satsetup.auto_scan Auto-Scan selected Satellite satsetup.auto_scan_all Auto-Scan multiple Satellites satsetup.manual_scan Manual frequency scan +satsetup.use_fta_flag just free Channels satsetup.use_nit Use NIT satsetup.diseqc_advanced Advanced satsetup.diseqc_order Input order diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index d1a41775e..94ca87cbb 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -88,9 +88,6 @@ void CDBoxInfoWidget::hide() { frameBuffer->paintBackgroundBoxRel(x,y, width,height); } -#define FP_IOCTL_GET_LNB_CURRENT 0x100 -#define FP_IOCTL_GETID 0 -#define FP_IOCTL_UPGRADE_CTRL 0x200 void CDBoxInfoWidget::paint() { @@ -320,7 +317,6 @@ void CDBoxInfoWidget::paint() break; case 1: mpOffset = nameOffset + 10; - snprintf(ubuf,buf_size,"%7.2f%c", (s.f_blocks * (s.f_bsize / 1024.0)) / gb, c); break; case 2: @@ -333,7 +329,6 @@ void CDBoxInfoWidget::paint() break; case 4: mpOffset = nameOffset+ (sizeOffset+10)*3+10; - snprintf(ubuf,buf_size,"%4ld%c", blocks_percent_used,'%'); break; } diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index 2a0df0c75..66f582a31 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -85,6 +85,7 @@ CScanTs::CScanTs() } extern int scan_pids; +extern int scan_fta_flag;//in zapit descriptors definiert #define get_set CNeutrinoApp::getInstance()->getScanSettings() int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) { @@ -93,6 +94,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) neutrino_msg_data_t data; //bool manual = (get_set.scan_mode == 2); int scan_mode = get_set.scan_mode; + scan_fta_flag = get_set.scan_fta_flag; + sat_iterator_t sit; bool scan_all = actionKey == "all"; bool test = actionKey == "test"; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 574eb9452..8a2cd94d0 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -610,7 +610,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) CMenuWidget * TestMenu; #endif - + CVideoSettings * videoSettings; CMenuOptionStringChooser* tzSelect; /************************************************************************************** @@ -1019,6 +1019,8 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings) CMenuOptionChooser* useNit = new CMenuOptionChooser(LOCALE_SATSETUP_USE_NIT, (int *)&scanSettings.scan_mode, OPTIONS_OFF1_ON0_OPTIONS, OPTIONS_OFF1_ON0_OPTION_COUNT, true, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); CMenuOptionChooser* scanPids = new CMenuOptionChooser(LOCALE_EXTRA_ZAPIT_SCANPIDS, &scan_pids, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + CMenuOptionChooser* ftaFlag = new CMenuOptionChooser(LOCALE_SATSETUP_USE_FTA_FLAG, (int *)&scanSettings.scan_fta_flag, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF1_ON0_OPTION_COUNT, true, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + CMenuWidget* satSetup = new CMenuWidget(LOCALE_SATSETUP_SAT_SETUP, NEUTRINO_ICON_SETTINGS); satSetup->addItem(GenericMenuSeparator); satSetup->addItem(GenericMenuBack); @@ -1164,16 +1166,18 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings) manualScan->addItem(fec); manualScan->addItem(mod_pol); manualScan->addItem(useNit); + manualScan->addItem(ftaFlag); manualScan->addItem(GenericMenuSeparatorLine); manualScan->addItem(new CMenuForwarder(LOCALE_SCANTS_TEST, true, NULL, scanTs, "test", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); - manualScan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "manual", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); + manualScan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "manual", CRCInput::convertDigitToKey(0), digiIcon(0))); CMenuWidget* autoScan = new CMenuWidget(LOCALE_SATSETUP_AUTO_SCAN, NEUTRINO_ICON_SETTINGS); addMenueIntroItems(*autoScan); autoScan->addItem(satSelect); autoScan->addItem(useNit); autoScan->addItem(scanPids); - autoScan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "auto", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); + autoScan->addItem(ftaFlag); + autoScan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "auto", CRCInput::convertDigitToKey(0), digiIcon(0))); CMenuOptionChooser* ojDiseqc = NULL; CMenuOptionNumberChooser * ojDiseqcRepeats = NULL; @@ -1201,7 +1205,8 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings) autoScanAll->addItem(new CMenuForwarder(LOCALE_SATSETUP_SATELLITE, true, NULL, satOnOff, "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); autoScanAll->addItem(useNit); autoScanAll->addItem(scanPids); - autoScanAll->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "all", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); + autoScanAll->addItem(ftaFlag); + autoScanAll->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "all", CRCInput::convertDigitToKey(0), digiIcon(0))); } settings.addItem(GenericMenuSeparator); @@ -2562,7 +2567,7 @@ bool CNeutrinoApp::getNVODMenu(CMenuWidget* menu) return false; menu->addItem(GenericMenuSeparator); - + int count = 0; char nvod_id[5]; diff --git a/src/system/locals.h b/src/system/locals.h index ca3f4a1ae..15aaa59e4 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -933,6 +933,7 @@ typedef enum { LOCALE_SATSETUP_AUTO_SCAN, LOCALE_SATSETUP_AUTO_SCAN_ALL, LOCALE_SATSETUP_MANUAL_SCAN, + LOCALE_SATSETUP_USE_FTA_FLAG, LOCALE_SATSETUP_USE_NIT, LOCALE_SATSETUP_USE_USALS, LOCALE_SATSETUP_USALS_REPEAT, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 14020717b..7bf926b4f 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -933,6 +933,7 @@ const char *locale_real_names[] = { "satsetup.auto_scan", "satsetup.auto_scan_all", "satsetup.manual_scan", + "satsetup.use_fta_flag", "satsetup.use_nit", "satsetup.use_usals", "satsetup.usals_repeat", diff --git a/src/system/settings.cpp b/src/system/settings.cpp index cb64f4938..ab735719c 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -162,6 +162,7 @@ bool CScanSettings::loadSettings(const char * const fileName, const delivery_sys scanType=(CZapitClient::scanType) configfile.getInt32("scanType", scanType); strcpy(satNameNoDiseqc, configfile.getString("satNameNoDiseqc", satNameNoDiseqc).c_str()); + scan_fta_flag = configfile.getInt32("scan_fta_flag", 0); scan_mode = configfile.getInt32("scan_mode", 1); // NIT (0) or fast (1) TP_fec = configfile.getInt32("TP_fec", 1); TP_pol = configfile.getInt32("TP_pol", 0); @@ -184,6 +185,7 @@ bool CScanSettings::saveSettings(const char * const fileName) configfile.setInt32( "scanType", scanType ); configfile.setString( "satNameNoDiseqc", satNameNoDiseqc ); + configfile.setInt32("scan_fta_flag", scan_fta_flag); configfile.setInt32("scan_mode", scan_mode); configfile.setInt32("TP_fec", TP_fec); configfile.setInt32("TP_pol", TP_pol); diff --git a/src/system/settings.h b/src/system/settings.h index 5a1e9705a..a718cd4b8 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -368,7 +368,7 @@ struct SNeutrinoSettings }; int lcd_setting[LCD_SETTING_COUNT]; - char lcd_setting_dim_time[4]; + char lcd_setting_dim_time[4]; char lcd_setting_dim_brightness[4]; #define FILESYSTEM_ENCODING_TO_UTF8(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a).c_str()) @@ -407,7 +407,7 @@ struct SNeutrinoSettings int filebrowser_showrights; int filebrowser_sortmethod; int filebrowser_denydirectoryleave; - + //uboot int uboot_lcd_inverse; int uboot_lcd_contrast; @@ -524,6 +524,7 @@ class CScanSettings delivery_system_t delivery_system; int scanSectionsd; int scan_mode; + int scan_fta_flag; int TP_fec; int TP_pol; int TP_mod; diff --git a/src/zapit/src/descriptors.cpp b/src/zapit/src/descriptors.cpp index 62bcfe0ec..9ac124b82 100644 --- a/src/zapit/src/descriptors.cpp +++ b/src/zapit/src/descriptors.cpp @@ -56,7 +56,7 @@ extern CFrontend *frontend; extern CEventServer *eventServer; extern int scan_pids; extern t_channel_id live_channel_id; - +int scan_fta_flag = 0; int add_to_scan(transponder_id_t TsidOnid, FrontendParameters *feparams, uint8_t polarity, bool fromnit = 0); void generic_descriptor(const unsigned char * const) @@ -400,6 +400,10 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s CZapitChannel *channel = NULL; bool tpchange = false; static transponder_id_t last_tpid = 0; + //scrambled + if(free_ca && scan_fta_flag){ + return; + } service_type = fix_service_type(service_type); uint8_t real_type = service_type; diff --git a/src/zapit/src/scan.cpp b/src/zapit/src/scan.cpp index 87e9d17e1..aa056e420 100644 --- a/src/zapit/src/scan.cpp +++ b/src/zapit/src/scan.cpp @@ -378,7 +378,7 @@ int scan_transponder(xmlNodePtr transponder, uint8_t diseqc_pos, t_satellite_pos if (cable && satfeed) { /* build special transponder for cable with satfeed */ status = build_bf_transponder(&feparams, satellitePosition); - } else + } else #endif { /* read network information table */ @@ -625,7 +625,7 @@ void * scan_transponder(void * arg) if (cable) { /* build special transponder for cable with satfeed */ build_bf_transponder(&(TP->feparams), satellitePosition); - } else + } else #endif { freq_id_t freq;