mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/dvbsi++' commit 5db16ee2ff

Browse Source 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
This commit is contained in:
Stefan Seyfried
2013-02-21 17:07:18 +01:00
parent c83a35ebfc 5db16ee2ff
commit 0cf191822a
42 changed files with 871 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
data/cables.xml
View File

@@ -515,6 +515,33 @@
<transponder frequency="538000" symbol_rate="6790000" fec_inner="0" modulation="3"/>
<transponder frequency="540000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
</cable>
<cable name="Antennengemeinschaft Penig" satfeed="true" flags="9">
<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="322000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="330000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="328000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="346000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="354000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="362000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="370000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="378000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="386000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="394000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="410000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="434000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
<transponder frequency="442000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="466000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable>
<cable name="M-net" satfeed="true" flags="9">
<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

3
data/icons/Makefile.am
View File

@@ -69,7 +69,6 @@ install_DATA += \
dd.png \
dd_avail.png \
dd_gray.png \
ddfill.png \
down.png \
error.png \
features.png \
@@ -110,6 +109,7 @@ install_DATA += \
hint_reboot.png \
hint_recording.png \
hint_reload.png \
hint_restart.png \
hint_save.png \
hint_scan.png \
hint_scripts.png \
@@ -162,6 +162,7 @@ install_DATA += \
mp3-5.jpg \
mp3-6.jpg \
mp3-7.jpg \
multimedia.png \
mute.png \
mute_small.png \
mute_zap_gray.png \

BIN
data/icons/ddfill.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 136 B

BIN
data/icons/hint_restart.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
data/icons/multimedia.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 371 B

BIN
data/icons/radio.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 64 KiB

15
data/locale/deutsch.locale
View File

@@ -200,6 +200,10 @@ bouquetname.new Neue Kanäle
bouquetname.other Unbekannter Provider
bouquetname.removed Gelöschte Kanäle
cablesetup.provider Kabelanbieter
channellist.additional Zusatzinformationen
channellist.additional_off aus
channellist.additional_on ein
channellist.additional_on_minitv ein (mit MiniTV)
channellist.current_tp Aktueller Transponder
channellist.edit Bearbeiten
channellist.epgtext_align_left links
@@ -221,6 +225,9 @@ channellist.make_hdlist Erzeuge Bouquet mit HD-Kanälen
channellist.make_newlist Erzeuge Bouquet mit neuen Kanälen
channellist.make_removedlist Erzeuge Bouquet mit gelöschten Kanälen
channellist.new_zap_mode Quickzap in Liste
channellist.new_zap_mode_active aktiv
channellist.new_zap_mode_allow erlauben
channellist.new_zap_mode_off aus
channellist.nonefound Es wurden keine Kanäle gefunden!\nFühren Sie bitte eine Kanalsuche durch\n(MENU-Taste -> Service)
channellist.provs Anbieter
channellist.recording_not_possible Aufnahme nicht möglich!
@@ -516,6 +523,7 @@ fontmenu.sizes Schriftgrössen
fontsize.channel_num_zap Direktauswahl
fontsize.channellist Kanalliste
fontsize.channellist_descr Beschreibung
fontsize.channellist_event Eventliste
fontsize.channellist_number Nummer
fontsize.epg_date EPG Datum
fontsize.epg_info1 EPG Info 1
@@ -733,6 +741,7 @@ menu.hint_cache_txt Startet das Zwischenspeichern des Teletext nach\nKanalwechse
menu.hint_cec_mode CEC-Modus
menu.hint_cec_standby CEC-Standby
menu.hint_cec_view_on CEC view ON
menu.hint_channellist_additional Definiert, ob zusätzliche Informationen im Hauptfenster angezeigt werden sollen
menu.hint_channellist_colored Definiert ob die aktuelle oder nächste Sendung in einer anderen Farbe dargestellt werden soll
menu.hint_channellist_epg_align Hier kann man festlegen, wie der Text für das EPG in der Liste\nrechts vom Programmnamen ausgerichtet wird
menu.hint_channellist_extended Bei aktivierter Funktion wird vor dem Sendernamen ein Balken eingeblendet,\nder den Sendungsfortschritt anzeigt
@@ -794,6 +803,7 @@ menu.hint_infobar_fonts Ändern Sie in der Infobar die Schriftgrößen
menu.hint_infobar_logo Logo- und Signal-Optionen
menu.hint_infobar_logo_dir Hier wählen Sie das Verzeichnis für die Senderlogos
menu.hint_infobar_on_epg Zeigt einen Hinweis bei EPG-Änderungen
menu.hint_infobar_progressbar Wählt die Optionen des Fortschrittsbalken in der Infobar
menu.hint_infobar_radiotext Zeigt Radiotext in einen Fenster, wenn verfügbar
menu.hint_infobar_res Zeige die gesendete Auflösung in Symbolen
menu.hint_infobar_sat Zeigt die aktuellen Satelliten- oder Kabel-Provider
@@ -1123,6 +1133,11 @@ miscsettings.infobar_disp_5 Logo/Signalbalken
miscsettings.infobar_disp_6 Logo+Kanalnummer/Signalbalken
miscsettings.infobar_disp_log Logo
miscsettings.infobar_logo_hdd_dir Logo Verz.
miscsettings.infobar_progressbar Fortschrittsbalken Opt.
miscsettings.infobar_progressbar_0 Standard
miscsettings.infobar_progressbar_1 unterhalb Kanalname
miscsettings.infobar_progressbar_2 unterhalb Kanalname schmal
miscsettings.infobar_progressbar_3 zwischen EPG-Events schmal
miscsettings.infobar_sat_display Kabel-/Satellitenanbieter
miscsettings.infobar_show Info bei EPG Änderungen
miscsettings.infobar_show_dd_available DD-Verfügbarkeit anzeigen

17
data/locale/english.locale
View File

@@ -200,6 +200,10 @@ bouquetname.new New channels
bouquetname.other Unknown provider
bouquetname.removed Removed channels
cablesetup.provider cable provider
channellist.additional Additional informations
channellist.additional_off off
channellist.additional_on on
channellist.additional_on_minitv on (with MiniTV)
channellist.current_tp Current transponder
channellist.edit Edit
channellist.epgtext_align_left left
@@ -221,6 +225,9 @@ channellist.make_hdlist Create list of HD channels
channellist.make_newlist Create list of new channels
channellist.make_removedlist Create list of removed channels
channellist.new_zap_mode Quickzap in list
channellist.new_zap_mode_active active
channellist.new_zap_mode_allow allow
channellist.new_zap_mode_off off
channellist.nonefound No channels were found!\nPlease execute a scan\n(MENU-key -> service)
channellist.provs Providers
channellist.recording_not_possible Recording not possible!
@@ -516,12 +523,13 @@ fontmenu.sizes Font sizes
fontsize.channel_num_zap direct selection
fontsize.channellist Channellist
fontsize.channellist_descr Description
fontsize.channellist_event Event list
fontsize.channellist_number Number
fontsize.epg_date EPG Date
fontsize.epg_info1 EPG Info 1
fontsize.epg_info2 EPG Info 2
fontsize.epg_title EPG Title
fontsize.eventlist_datetime Date / Dime
fontsize.eventlist_datetime Date / Time
fontsize.eventlist_itemlarge Large
fontsize.eventlist_itemsmall Small
fontsize.eventlist_title Title
@@ -733,6 +741,7 @@ menu.hint_cache_txt Start teletext caching after channel switch
menu.hint_cec_mode CEC mode
menu.hint_cec_standby CEC standby
menu.hint_cec_view_on CEC view ON
menu.hint_channellist_additional Show additional informations\nin main box
menu.hint_channellist_colored Use different color for current or next event
menu.hint_channellist_epg_align EPG event align
menu.hint_channellist_extended Show current event progress bar
@@ -794,6 +803,7 @@ menu.hint_infobar_fonts Change infobar font sizes
menu.hint_infobar_logo Logo / signal options
menu.hint_infobar_logo_dir Select directory to search for channels logo
menu.hint_infobar_on_epg Show infobar on current EPG event change
menu.hint_infobar_progressbar Selects the options of Progressbar in the Infobar
menu.hint_infobar_radiotext Show radiotext window
menu.hint_infobar_res Show channel resolution icons
menu.hint_infobar_sat Show current satellite or cable provider
@@ -1123,6 +1133,11 @@ miscsettings.infobar_disp_5 Logo+signal
miscsettings.infobar_disp_6 Logo+channel number+signal
miscsettings.infobar_disp_log Logo
miscsettings.infobar_logo_hdd_dir Logo dir
miscsettings.infobar_progressbar progressbar options
miscsettings.infobar_progressbar_0 standard
miscsettings.infobar_progressbar_1 below channel name
miscsettings.infobar_progressbar_2 small below channel name
miscsettings.infobar_progressbar_3 narrow between EPG-Events
miscsettings.infobar_sat_display Satellite display on infobar
miscsettings.infobar_show show Info on EPG change
miscsettings.infobar_show_dd_available show DD availability