Merge remote-tracking branch 'gui-neutrino/master'

data/icons/hints/Makefile.am

@@ -6,11 +6,14 @@ install_DATA = \
 	hint_aplay.png \
 	hint_audio.png \
 	hint_back.png \
+	hint_backup.png \
 	hint_bedit.png \
 	hint_ci.png \
 	hint_dboxinfo.png \
+	hint_default.png \
 	hint_delete.png \
 	hint_extended.png \
+	hint_factory.png \
 	hint_fileplay.png \
 	hint_games.png \
 	hint_hdd.png \
@@ -19,6 +22,7 @@ install_DATA = \
 	hint_info.png \
 	hint_keys.png \
 	hint_language.png \
+	hint_load.png \
 	hint_manage.png \
 	hint_mb.png \
 	hint_media.png \
@@ -34,8 +38,11 @@ install_DATA = \
 	hint_reboot.png \
 	hint_recording.png \
 	hint_reload.png \
+	hint_reset.png \
 	hint_restart.png \
+	hint_restore.png \
 	hint_save.png \
+	hint_saveas.png \
 	hint_scan.png \
 	hint_scripts.png \
 	hint_service.png \

data/icons/status/ca/Makefile.am

@@ -28,6 +28,9 @@ install_DATA = \
 	seca_green.png \
 	seca_white.png \
 	seca_yellow.png \
+	tan_green.png \
+	tan_white.png \
+	tan_yellow.png \
 	via_green.png \
 	via_white.png \
 	via_yellow.png \

data/locale/deutsch.locale

@@ -544,6 +544,13 @@ extra.tp_mod_auto QAM/AUTO
 extra.tp_pilot Pilot
 extra.tp_pilot_auto Auto (HW)
 extra.tp_pilot_auto_sw Auto (SW)
+extra.tp_plc PLM Code
+extra.tp_pli Stream ID
+extra.tp_plm PLS Modus
+extra.tp_plm_combo Combo
+extra.tp_plm_gold Gold
+extra.tp_plm_root Root (Standard)
+extra.tp_plm_unk Unbekannt
 extra.tp_pol Polarisation
 extra.tp_pol_h H
 extra.tp_pol_l L
@@ -983,6 +990,7 @@ mainmenu.games Spiele
 mainmenu.head Hauptmenü
 mainmenu.lua Lua-Plugins
 mainmenu.media Multimedia
+mainmenu.mediaplayer Mediaplayer
 mainmenu.movieplayer Movieplayer
 mainmenu.pausesectionsd EPG auslesen
 mainmenu.pictureviewer Bildbetrachter
@@ -1153,7 +1161,7 @@ menu.hint_inet_radio Internetradio
 menu.hint_info Systeminformationen anzeigen.
 menu.hint_infobar_back Ändern Sie die Hintergrundfarbe für die Infobar
 menu.hint_infobar_buttons_usertitle Erzwingt die benutzerdefinierten Titel der Farbtasten
-menu.hint_infobar_casys ein: zeigt alle Aktiven farbig, Mini: einzelnes Symbol ob gesperrt, Diskret: alle Aktiven CA-Systeme
+menu.hint_infobar_casys ein: zeigt alle CA-Systeme; diskret: zeigt nur aktive CA-Systeme; mini: einzelnes Symbol in der Fußleiste
 menu.hint_infobar_casys_color Ändern Sie die Hintergrundfarbe für die CA-Systemanzeige der Infobar
 menu.hint_infobar_casys_dotmatrix ein: CA-Systemanzeige mit Punktematrix im Hintergrund
 menu.hint_infobar_casys_frame ein: CA-Systemanzeige mit Rahmen
@@ -1622,8 +1630,8 @@ miscsettings.infobar_buttons_usertitle Benutzertitel für Farbtasten
 miscsettings.infobar_casystem_display CA-Systemanzeige
 miscsettings.infobar_casystem_dotmatrix CA-Anzeige mit Punktematrix
 miscsettings.infobar_casystem_frame CA-Anzeige mit Rahmen
-miscsettings.infobar_casystem_mini Mini
-miscsettings.infobar_casystem_mode Diskret
+miscsettings.infobar_casystem_mini mini
+miscsettings.infobar_casystem_mode diskret
 miscsettings.infobar_disp Logo-Anzeige
 miscsettings.infobar_disp_0 Kanalname [Kanalnummer]
 miscsettings.infobar_disp_1 Kanalnummer, Kanalname [Logo]
@@ -1907,7 +1915,8 @@ movieplayer.bookmarkname Bookmark Name
 movieplayer.bookmarkname_hint1 Geben Sie den Namen für das neue Lesezeichen ein
 movieplayer.bookmarkname_hint2 
 movieplayer.chapters Kapitel
-movieplayer.fileplayback Abspielen (Multiformat)
+movieplayer.fileplayback_audio Multiformat-Audiowiedergabe
+movieplayer.fileplayback_video Multiformat-Videowiedergabe
 movieplayer.head Movieplayer
 movieplayer.help_additional Weitere benutzerdefinierte Tastenbelegungen sind unter "Hauptmenü" > "Einstellungen" > "Tasten" > "Bearbeiten" > "Movieplayer" zu finden.\n\nWährend der Wiedergabe von Filmen sind im Hauptmenü einige Menüpunkte deaktiviert.
 movieplayer.help_button_1 1 Minute zurück
@@ -2360,6 +2369,7 @@ servicemenu.restarting_tuner Tuner wird neu gestartet
 servicemenu.scants Kanalsuche
 servicemenu.update Software-Aktualisierung
 settings.backup System-Einstellungen sichern
+settings.backup_dir Nach %s sichern?\n"Nein" wählt ein anderes Verzeichnis
 settings.backup_failed Sicherung fehlgeschlagen!
 settings.help Hilfe
 settings.menu_hints Hinweise anzeigen
@@ -2512,7 +2522,7 @@ timing.volumebar Lautstärkeanzeige
 tunersetup.cable Kabel (DVB-C)
 tunersetup.hybrid Hybrid (DVB-C/T/T2)
 tunersetup.mode Betriebsmodus
-tunersetup.power 5V Versorgung bei DVB-T/T2 Kanälen
+tunersetup.power 5V-Versorgung bei DVB-T/T2 Kanälen
 tunersetup.terr Terrestrisch (DVB-T/T2)
 tmdb.api_key TMDb API Schlüssel
 tmdb.enabled TMDb-Unterstützung

data/locale/english.locale

@@ -544,6 +544,13 @@ extra.tp_mod_auto QAM/AUTO
 extra.tp_pilot Pilot
 extra.tp_pilot_auto Auto (HW)
 extra.tp_pilot_auto_sw Auto (SW)
+extra.tp_plc PLM Code
+extra.tp_pli Stream ID
+extra.tp_plm PLS Mode
+extra.tp_plm_combo Combo
+extra.tp_plm_gold Gold
+extra.tp_plm_root Root (Default)
+extra.tp_plm_unk Unknown
 extra.tp_pol Polarization
 extra.tp_pol_h H
 extra.tp_pol_l L
@@ -983,6 +990,7 @@ mainmenu.games Games
 mainmenu.head Main Menu
 mainmenu.lua Lua Plugins
 mainmenu.media Media
+mainmenu.mediaplayer Mediaplayer
 mainmenu.movieplayer Movieplayer
 mainmenu.pausesectionsd Read EPG
 mainmenu.pictureviewer Picture viewer
@@ -1153,7 +1161,7 @@ menu.hint_inet_radio Internet radio
 menu.hint_info Show system informations.
 menu.hint_infobar_back Change infobar background color
 menu.hint_infobar_buttons_usertitle Forces userdefined titles for the color keys
-menu.hint_infobar_casys On: display all with colored active, mini: single\nlocked icon, descreet: all active ca-systems
+menu.hint_infobar_casys on: display all CA systems, descreet: display active CA systems; mini: single symbol in footer
 menu.hint_infobar_casys_color Change CA-System background color
 menu.hint_infobar_casys_dotmatrix on: CA-System with dot matrix in background
 menu.hint_infobar_casys_frame on: CA-System with frame
@@ -1907,7 +1915,8 @@ movieplayer.bookmarkname Bookmarkname
 movieplayer.bookmarkname_hint1 Enter a name for your new bookmark
 movieplayer.bookmarkname_hint2 
 movieplayer.chapters Chapters
-movieplayer.fileplayback File play
+movieplayer.fileplayback_audio Multiformat Audio Player
+movieplayer.fileplayback_video Multiformat Video Player
 movieplayer.head Movieplayer
 movieplayer.help_additional To find more user definable key bindings, see "Mainmenu" > "Settings" > "Keys" > "Edit" > "Movieplayer".\n\nWhile movie playback some menuitems in mainmenu are deactivated.
 movieplayer.help_button_1 1 minute backward
@@ -2360,6 +2369,7 @@ servicemenu.restarting_tuner Restarting tuner
 servicemenu.scants Servicescan
 servicemenu.update Software Update
 settings.backup Save system settings
+settings.backup_dir Save to %s?\n"No" chooses another directory.
 settings.backup_failed Backup failed!
 settings.help Help
 settings.menu_hints Show menu hints
@@ -2511,8 +2521,8 @@ timing.static_messages Interactive messages
 timing.volumebar Volume bar
 tunersetup.cable Cable (DVB-C)
 tunersetup.hybrid Hybrid (DVB-C/T/T2)
-tunersetup.mode Operation Mode
-tunersetup.power 5V Supply on DVB-T/T2 Channels
+tunersetup.mode Operation mode
+tunersetup.power 5V supply on DVB-T/T2 channels
 tunersetup.terr Terrestrial (DVB-T/T2)
 tmdb.api_key TMDb API key
 tmdb.enabled TMDb support

data/webradio_usr.xml

@@ -10,4 +10,5 @@
 	<webradio title="90s90s - The Beat of the 90s" urlkey="0" url="http://streams.90s90s.de/main/mp3-192/streams.90s90s.de/" description="" genre="90s90s" />
 	<webradio title="90s90s - Hits" urlkey="0" url="http://streams.90s90s.de/pop/mp3-192/streams.90s90s.de/" description="" genre="90s90s" />
 	<webradio title="90s90s - Boygroups" urlkey="0" url="http://streams.90s90s.de/boygroup/mp3-192/streams.90s90s.de/" description="" genre="90s90s" />
+	<webradio title="StompFM" urlkey="0" url="http://51.255.104.137:8057/" description="stompfm.de ... so klingt Berlin!" genre="StompFM" />
 </webradios>

data/y-web/Y_Info_Help.yhtm

@@ -7,10 +7,10 @@
 	{=var-set:help_url=Help-Info-Hilfe=}{=var-set:menu={=L:info.help=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<ul>
-		<li><a href="http://wiki.tuxbox.org/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki Help</a></li>
+		<li><a href="http://wiki.tuxbox.org/wiki/Neutrino-HD" class="exlink" title="User guide for Neutrino" target="_blank">Tuxbox-Wiki Neutrino Help</a></li>
+		<li><a href="http://wiki.tuxbox.org/wiki/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki yWeb Help</a></li>
 		<li><a href="http://forum.tuxbox.org/forum" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
-		<li><a href="http://www.cstworld.net" class="exlink" title="CST User Forum" target="_blank">CST User Forum</a></li>
-		<li><a href="https://dbox2world.net/board/329-development/" class="exlink" title="CST Dev Forum" target="_blank">CST Developer Forum</a></li>
+		<li><a href="http://tuxbox-neutrino.org" class="exlink" title="Tuxbox-Neutrino developers" target="_blank">Sources</a></li>
 	</ul>
 	</div>
 </div>

lib/hardware/coolstream/hd1/libcoolstream/video_cs.h

@@ -21,8 +21,6 @@
 #define CS_VIDEO_PDATA void
 #endif
 
-#define SCREENSHOT 1
-
 typedef enum {
 	ANALOG_SD_RGB_CINCH = 0x00,
 	ANALOG_SD_YPRPB_CINCH,

src/Makefile.am

@@ -135,6 +135,7 @@ neutrino_LDADD = \
 if ENABLE_GRAPHLCD
 neutrino_LDADD += -lglcddrivers -lglcdgraphics -lusb-1.0
 endif
+
 if ENABLE_GIFLIB
 neutrino_LDADD += -lgif
 else
@@ -203,17 +204,6 @@ endif
 if BOXTYPE_COOL
 bin_PROGRAMS += shutdown_helper
 shutdown_helper_SOURCES = shutdown_helper.c
-# if BOXMODEL_CS_HD2
-# else
-# noinst_PROGRAMS = uncoolinit
-# uncoolinit_SOURCES = uncoolinit.cpp
-# uncoolinit_LDADD = \
-# 	@AVFORMAT_LIBS@ \
-# 	@AVCODEC_LIBS@ \
-# 	@BLURAY_LIBS@ \
-# 	-lcoolstream-mt -lca-sc -lnxp \
-# 	-lOpenThreads -lrt
-# endif
 endif
 
 if USE_STB_HAL

src/driver/audiodec/ffmpegdec.cpp

@@ -253,7 +253,12 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
 
 	mSampleRate = samplerate;
 	mChannels = av_get_channel_layout_nb_channels(AV_CH_LAYOUT_STEREO);
+
+#if !HAVE_ARM_HARDWARE
 	audioDecoder->PrepareClipPlay(mChannels, mSampleRate, 16, 1);
+#else
+	audioDecoder->PrepareClipPlay(mChannels, mSampleRate, 16, 0);
+#endif
 
 	AVFrame *frame = NULL;
 	AVPacket rpacket;

src/driver/pictureviewer/pictureviewer.cpp

@@ -737,7 +737,7 @@ void CPictureViewer::rescaleImageDimensions(int *width, int *height, const int m
 bool CPictureViewer::DisplayImage(const std::string & name, int posx, int posy, int width, int height, int transp)
 {
 	if(width < 1 || height < 1){
-		dprintf(DEBUG_NORMAL,  "[CPictureViewer] [%s - %d] Error: width %i height %i \n", __func__, __LINE__, width, height);
+		dprintf(DEBUG_NORMAL,  "[CPictureViewer] [%s - %d] Error: image [%s] width %i height %i \n", __func__, __LINE__, name.c_str(), width, height);
 		return false;
 	}