update version to 3.7.0

eplayer beta

ChangeLog

@@ -1,3 +1,894 @@
+2017-12-21  Thilo Graf  <dbt@novatux.de>
+
+	update version to 3.7.0
+	eplayer beta
+
+2017-12-21  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- user-menu: avoid empty headers in user-menu
+
+2017-12-21  TangoCash  <eric@loxat.de>
+
+	- filebrowser: add size() and getFilter() members
+
+2017-12-21  Thilo Graf  <dbt@novatux.de>
+
+	Fileplay: add separat fileplay for audio and video
+
+2017-12-19  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- user-menu: add audio fileplay item
+	 Conflicts:
+		src/gui/user_menue_setup.cpp
+		src/system/settings.h
+
+	- neutrino: add more RC_playpause handling
+	 Conflicts:
+		src/gui/movieplayer.cpp
+
+	- neutrino: add RC_playpause handling; change some key defaults for ARM_HARDWARE
+	 Conflicts:
+	    src/neutrino.cpp
+
+	- rcinput: add RC_playpause key
+	 Conflicts:
+		src/driver/rcinput.cpp
+		src/driver/rcinput.h
+
+2017-12-18  GetAway  <get-away@t-online.de>
+
+	audiomute.cpp: fix clear screen after audiomute
+
+2017-12-18  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- acinclude: configure for generic hardware by default
+
+	- streaminfo: add fallback to delivery system detection
+
+	- settings_manager: fix issue tag on reset settings item
+
+2017-12-18  Thilo Graf  <dbt@novatux.de>
+
+	Icons: use fixed language and youtube icon
+	Format was wrong.
+
+	Icons: use default hint from own icon set
+
+2017-12-18  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- icons: add default hint icon
+
+2017-12-18  Thilo Graf  <dbt@novatux.de>
+
+	Icons: add missing hint icons and fix some files with format errors
+
+2017-12-17  Thilo Graf  <dbt@novatux.de>
+
+	icons: fix assignment of settings, network and mainmenu icons
+	Assignment was confused. There are probaly more.
+
+	CSettingsManager: add cancel buttons to backup/save config messages
+	User should have this possibility because 'yes' and 'no'
+	are coming with defined effects.
+
+	CSettingsManager: use neutrino internal debug output,
+
+2017-12-17  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- settings_manager: remember last used directory
+	 Conflicts:
+		data/locale/deutsch.locale
+		data/locale/english.locale
+		src/gui/settings_manager.cpp
+
+	- settings_manager: add TARGET_PREFIX define to backup/restore calls
+
+2017-12-17  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- acinclude: fix TARGET_PREFIX define for native target
+
+	Note: TARGET_PREFIX describes inside the yocto SDK the toolchain
+	binary prefix for the target tools. Maybe this could make confuse
+	with usage of yocto SDK environment. Maybe we should rename this variable.
+	e.g EXEC_PREFIX or so ...
+
+2017-12-17  Thilo Graf  <dbt@novatux.de>
+
+	icons: add missing picon vor save as
+
+	CPictureViewer: add current image into debug line
+	It's not possible to see which file causes this error.
+
+2017-12-16  Thilo Graf  <dbt@novatux.de>
+
+	CSettingsManager: add hintbox while execute backup_sh
+
+2017-12-15  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- infoviewer_bb: small renamings to get more logic in function names
+	showOne_CAIcon()     => showIcon_CA()
+	paint_ca_icons()     => paint_ca_icon()
+	showIcon_CA_Status() => paint_ca_icons()
+
+	 Conflicts:
+		src/gui/infoviewer.cpp
+		src/gui/infoviewer_bb.cpp
+
+2017-12-15  TangoCash  <eric@loxat.de>
+
+	fix icon alignment
+	 Conflicts:
+		src/gui/infoviewer_bb.cpp
+
+2017-12-15  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- menu: fix right offset for very long right texts
+
+	- locale: small changes in infobar ca system locales
+
+	- zapit/channel: fix issue tag from 4bacd77f8bcd61c21b99a1cfc52fce6a8d46c5fd
+
+	- infoviewer_bb: add gradient to ca-bar; ...
+	use always CComponentsShapeSquare to paint ca-bar
+
+	- infoviewer_bb: always show hdd fill level for a more uniform view; ...
+	mark undetected hdd fill level with a small line over the progressbar.
+	this avoids a "whole" in footer when gradient is active
+
+2017-12-15  Thilo Graf  <dbt@novatux.de>
+
+	data: update crypt icons
+	thx OneOfNine
+
+2017-12-15  TangoCash  <eric@loxat.de>
+
+	update cryptsystems
+
+2017-12-15  Thilo Graf  <dbt@novatux.de>
+
+	CComponentsFooter: fix force re init of button container
+	clear() removes only items and their instances inside button container, but all
+	other properties (e.g. width) are not touched. Re init should avoids this.
+
+	CTestMenu: add example for variable caption inside message buttons
+
+2017-12-14  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	src/gui/screensetup.cpp reset channellist modules
+
+2017-12-11  Thilo Graf  <dbt@novatux.de>
+
+	CZapitChannel: add issue tag
+	This should be reworked
+
+2017-12-11  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- channellist: fix segfault while virtual zapping and bouquets are empty
+
+	- rcinput: fix compiler warnings about unused variables
+
+2017-12-10  TangoCash  <eric@loxat.de>
+
+	adding adapter to debug output
+
+	tryfix scan frontend selection
+
+2017-12-10  Thilo Graf  <dbt@novatux.de>
+
+	CMenuWidget: ensure use of unified data type const char*
+	This should avoid possible compiler errors for this overloaded method.
+
+	CComponentsInfoBox: add possibility for scalable picons
+
+	CServiceManager: use value 0 as init value for feparams.plp_id
+	Value of NO_STREAM_ID_FILTER = ~0U
+	This could provokate overflow errors or possible compile errors
+	related with compiler flags (e.g: -Werror=overflow)
+
+2017-12-10  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- webradio_usr.xml: add link to stompfm.de
+
+2017-12-10  TangoCash  <eric@loxat.de>
+
+	fix bouquets freq handling for DVB-T/T2
+
+2017-12-10  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- acinclude/configure: some more minor format changes
+
+	- acinclude/configure: some minor format changes; fix indentations
+
+	- configure: fix logic around libswresample
+
+	- configure: move libstb-hal block down
+
+	- acinclude: use AS_HELP_STRING() for --with-boxmodel; ...
+	i don't know any other way to get linefeeds in right-hand text
+
+	- configure: invert --disable-lua false logic to --enable-lua true
+
+	- configure: invert --disable-upnp false logic to --enable-upnp true
+
+	- acinclude: unify descriptions in TUXBOX_APPS_DIRECTORY_ONE()
+
+	- configure: unify and simplify some AC_ARG_ENABLE() calls
+
+	- acinclude/configure: show defaults
+
+2017-12-10  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	femanager.h increase max adapters to 4
+
+2017-12-08  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- acinclude: replace custom formatting in TUXBOX_APPS_DIRECTORY_ONE with AS_HELP_STRING()
+
+	- configure: cleanup from commented code
+
+	- acinclude/configure: unify usage of AS_HELP_STRING(); minor format changes
+
+	- acinclude: small resort to get the plugin-dir variables consecutively
+
+	- acinclude: remove some double code
+
+2017-12-07  TangoCash  <eric@loxat.de>
+
+	fix cable nit
+
+	This should fix possible unintended multiple scans.
+
+2017-12-06  Frankenstone  <dampf_acc@yahoo.com>
+
+	osd_setup.cpp: fix colormenu shadow
+
+	alpha was bounded to menue head alpha
+
+2017-12-06  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- zapit/scannit: fix typo in last commit
+
+	'last commit' = 7b75b1d9dbc856d4547168ef35084e45304b5e6f
+
+2017-12-06  TangoCash  <eric@loxat.de>
+
+	fix scannit
+
+	update scan infos
+
+	show PLI/PLC/PLM while scanning
+
+	add PLI/PLC/PLM to manual transponder selection
+
+	workaround for T2 resolution display
+
+	add DVB-S2X support
+
+	fix DVB-T2 transponders
+
+2017-12-06  Frankenstone  <dampf_acc@yahoo.com>
+
+	fix frontend Uni2 / JESS (thx DboxOldie)
+
+2017-12-06  Thilo Graf  <dbt@novatux.de>
+
+	localize: try to fix different path to iso tab
+
+2017-12-05  Thilo Graf  <dbt@novatux.de>
+
+	yWeb Help: remove invalid help links
+
+2017-12-04  Thilo Graf  <dbt@novatux.de>
+
+	widget/hintbox.cpp: add explicit init of var picon
+	Had some issues while compile with gcc 7.x.
+	Exact data type was expected.
+
+	cc_item_picture.h: remove virtual declaration from setPicture()
+	Is not really required.
+	Avoids possible compile/linker errors like "...no reference..." for some
+	coming changes.
+
+2017-12-04  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- neutrino.h: remove obsolete external genre_sub_classes variables
+
+2017-12-03  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	fix radiotext title background (merge fix)
+
+	enable yt for generic
+
+	typo
+
+	fix resource leak
+
+2017-12-02  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- infoviewer_bb: use OFFSET defines; ...
+	height of ca-bar now depends on height of ca-icons
+	cleanup from commented code
+
+2017-12-01  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	Revert "- media-menu: disable currently broken audioplayer for ARM_HARDWARE"
+	This reverts commit 3d91cd9e13ed76cfc3a67fc21b503a8deb407606 because it's fixed in 334ce41
+
+2017-12-01  max_10  <max_10@gmx.de>
+
+	- ffmpegdec: fix audio playback for ARM_HARDWARE
+
+2017-12-01  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- infoviewer: avoid display of radiotext icon in virtual zap mode
+
+	- infoviewer: cleanup from some unused code
+	 Conflicts:
+		src/gui/infoviewer.cpp
+
+	- infoviewer_bb: fix offset for first status-icon
+
+	- infoviewer_bb: take footer height from CComponentsFooter ...
+	to get this footer in sync with the footers of other gui elements
+
+	- usermenu: cleanup from ITEM_RASS
+
+	- infoviewer: rework radiotext element; ...
+	use OFFSET defines, larger font, fix header width
+
+	- radiotext: cleanup from tons of unused code; rass is dead
+
+	- icons: cleanup from unused icons
+	 Conflicts:
+		data/icons/buttons/orphaned/0-green.png
+		data/icons/buttons/orphaned/0-red.png
+		data/icons/buttons/orphaned/1-green.png
+		data/icons/buttons/orphaned/1-red.png
+		data/icons/buttons/orphaned/2-green.png
+		data/icons/buttons/orphaned/2-red.png
+		data/icons/buttons/orphaned/3-green.png
+		data/icons/buttons/orphaned/3-red.png
+		data/icons/buttons/orphaned/4-green.png
+		data/icons/buttons/orphaned/4-red.png
+		data/icons/buttons/orphaned/5-green.png
+		data/icons/buttons/orphaned/5-red.png
+		data/icons/buttons/orphaned/6-green.png
+		data/icons/buttons/orphaned/6-red.png
+		data/icons/buttons/orphaned/7-green.png
+		data/icons/buttons/orphaned/7-red.png
+		data/icons/buttons/orphaned/8-green.png
+		data/icons/buttons/orphaned/8-red.png
+		data/icons/buttons/orphaned/9-green.png
+		data/icons/buttons/orphaned/9-red.png
+		data/icons/buttons/orphaned/longpress.png
+		data/icons/hints/hint_rass.png
+		data/icons/hints/hint_spark.png
+		data/icons/various/rass.png
+
+	- icons.h: cleanup from unused defines
+
+	- remove unused src/driver/stacktrace.h; use src/system/stacktrace.h if needed
+	 Conflicts:
+		src/driver/stacktrace.h
+
+	- neutrino: try to fix timer_wakeup handling; ...
+	The return to deepstandby after timer-wakeups was broken.
+
+	- locale: minor changes on new tunersetup locales
+
+2017-12-01  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	disable setVolume in standby mode
+
+2017-11-28  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- zapit/frontend: fix compiler warning
+
+2017-11-28  TangoCash  <eric@loxat.de>
+
+	frontend: fix fall through
+
+	add DVB-T2 support, enable 5V supply
+
+2017-11-28  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	prepare for T2 patch
+
+2017-11-27  TangoCash  <eric@loxat.de>
+
+	fix AAC record and playback
+
+2017-11-27  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- zapit: remove some ifdef's; prepare for upcoming patches
+
+	- neutrino: don't write timerinfo's when exiting to reboot
+
+	- neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE
+	when screensaver is stopped the playback is stopped too
+
+	- screensaver: move more repeatedly used code to screensaver's code
+
+	- movieplayer: use members from screensaver's code
+	 Conflicts:
+		src/gui/movieplayer.cpp
+
+	- neutrino: move screensaver members to screensaver's code
+
+	- neutrino: enable screensaver for mode_webradio
+
+	- shutdown_helper: better explanation of what the tool does; ...
+	small code re-formatting
+
+2017-11-25  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- cablex.xml: add OstTelCom; thx to elstablo
+	http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
+
+2017-11-24  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	fix radiotext for armbox
+
+2017-11-23  Thilo Graf  <dbt@novatux.de>
+
+	Revert "shutdown_helper: add calling '/etc/init.d/rcK'"
+	This reverts commit 6709ae0feb9544a1cc4f45a982f9f7bd0f131ec8.
+
+2017-11-23  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	fix webtv script path
+
+2017-11-23  Thilo Graf  <dbt@novatux.de>
+
+	CComponentsTimer: try to fix timing on non cst hardware
+	On hd51 and pc hardware was observed full visual timeout progress in message boxes.
+	Timeoout was displayed always without visible progress.
+	This should fix this.
+
+2017-11-22  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- neutrino: deactivate compatibility code in ExitRun(); ...
+	our start script is aligned to new exit code 2
+	see https://bitbucket.org/neutrino-images/ni-buildsystem/commits/cd1328c41cb642c141b58d001dce06a96eff0a1c
+
+2017-11-22  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- neutrino: add exit codes to handle some actions in neutrino's start script
+	EXIT_REBOOT is inactive yet; see comment in ExitRun()
+
+	 Conflicts:
+		src/neutrino.cpp
+
+2017-11-22  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- neutrino: always write /tmp/.timer ...
+	otherwise the vfd stays blank in deepstandby, if leds are configured off
+	and no timer is set. HD2's vfd urgently needs the fp.brightness value
+	which is not written to frontpanel in this case.
+
+	- neutrino: unify console-output for different conditions in ExitRun()
+
+	- neutrino: fix file-check in ExitRun() ... was a c/p error
+
+2017-11-22  J. Krieg  <bellum07@googlemail.com>
+
+	shutdown_helper: add calling '/etc/init.d/rcK'
+	...to prevent possible file system corruption prior shutting down
+
+2017-11-22  Striper  <gandharva@gmx.de>
+
+	- rename uncooloff workaround to something less idiotic
+
+2017-11-22  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- neutrino: more small cleanups in ExitRun()
+	 Conflicts:
+		src/neutrino.cpp
+
+	- neutrino: cleanup ExitRun() function from unused code
+	 Conflicts:
+		src/neutrino.cpp
+
+	- controlapi: add mode_webradio to GetModeCGI()
+
+	- neutrino: clearify mode handling in saveEpg() function
+	 Conflicts:
+		src/driver/scanepg.cpp
+		src/neutrino.cpp
+
+	- neutrino: unify modes handling; ...
+	remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes
+
+2017-11-22  FlatTV  <FlatTV@gmx.de>
+
+	capmt.cpp: Fix stop decoding
+	don't stop decoding if record stops, this break overlapped record on cst
+
+2017-11-20  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino
+
+2017-11-19  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- simple_display: show scrambled icon on scrambled channels
+
+	- simple_display: show mute icon in muted mode
+
+2017-11-19  Thilo Graf  <dbt@novatux.de>
+
+	src/gui/components/cc_frm_window.cpp: fix too small left bottom corner
+	radius is allready calculatetd in base class src/gui/components/cc_frm.cpp
+	in member CComponentsForm::paintCCItems()
+
+	NOTE:
+	It seems the radius calculation inside framebuffer don't working correct
+	for corners on the right site on top and bottom.
+	Seen on hd51 hardware on osd-boxes with shadow
+	(e.g. infobar) or Boxes with frames e.g. on  error message windows, buttons.
+	There are pixel errors like minimal holes on osd or displaced pixels.
+	On CST hardware evreything is ok.
+
+2017-11-19  Thilo Graf  <dbt@novatux.de>
+
+	CTestMenu: add gui restart item for faster access
+
+	CImageInfo: expand fallback to get readable version string
+	Evaluation of one char could be not enough to get a right result.
+
+2017-11-17  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- neutrino: fix tv/radio switch for coolstream; ...
+	the TV/Radio key returns RC_tv. So we can't use RC_radio code here.
+
+2017-11-17  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	add dependency to libswscale for armbox
+
+	add dependency to libswscale for armbox
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- neutrino: don't load webradio xml on HD1 hardware; ...
+	audiostreams doesn't work
+
+	- simple_display: fix compile for GENERIC_HARDWARE
+
+2017-11-16  TangoCash  <eric@loxat.de>
+
+	armbox: read frontend real names
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- vfd-setup: allow to set scroll_repeats if possible
+
+	- neutrino: display's setScrollMode() needs to be called on every start
+
+	- simple_display: dont show symbols in shutdown mode too
+
+	- vfd: re-add by mistake removed setting "off" for statusbar
+
+	- timerlist: don't cast saved_displaymode
+
+	- movieplayer: try to fix display of servicename; ...
+	name can be changed while playing movies
+
+	- simple_display: simplify some proc_put calls
+
+	- proc_tools: add helper member to put values w/o length; ...
+	align included headers to c++
+
+	- simple_display: switch back to simplified proc_put calls
+
+	- proc_tools: c => cpp; add new helper member to write bool values
+
+	- simple_display: align f9b55ca to new proc_put calls
+
+	hd51: dont show symbols in standby
+
+	- simple_display: allow to set scroll mode
+
+	- simple_display: use proc_tools
+	 Conflicts:
+		src/driver/simple_display.cpp
+
+	- neutrino: avoid some ifdef's; prioritize proc filesystem
+
+	- system: add seife's proc_tools
+
+2017-11-16  Thilo Graf  <dbt@novatux.de>
+
+	capmt.cpp: try to fix ci handling
+	Based up:
+	https://bitbucket.org/neutrino-images/ni-neutrino-hd/commits/f3775d18142afe4341dcb3e52627cf5bd912d4a4
+	https://bitbucket.org/neutrino-images/ni-neutrino-hd/commits/600aa573688114b6d2bb3cbf95a3df2294e40998
+	by FlatTV, Striper
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- vfd-setup: hide statusline option from models w/o a statusline in vfd
+
+2017-11-16  Thilo Graf  <dbt@novatux.de>
+
+	coolstream/hardware_caps.h: fix broken cs build
+	'display_has_statusline' was missed with commit:
+	f6093052466d9da01db74315a07bf82c249838ca
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- hardware_caps: add display_has_statusline member
+
+	- vfd-setup: more readability; just cosmetics
+
+	- vfd-setup: don't show separatorline when backlight menu isn't shown
+
+	- simple_display: avoid compiler warning
+
+	- simple_display: fix compile for non-ARM_HARDWARE
+	 Conflicts:
+		src/driver/simple_display.cpp
+
+	- simple_display: add possibility to show text when changing mode
+
+	- simple_display: add missing MODE_MENU_UTF8 check in setMode()
+
+	- simple_display: rename display() to ShowText() ... as in vfd.cpp
+	 Conflicts:
+		src/driver/simple_display.cpp
+
+	- simple_display: cleanup from unused code inside ifdef mess
+
+	- timerlist: fix saved_dispmode
+
+	- cables.xml: use german umlauts for german nets; ...
+	Note: encoding is iso-8859-1
+
+	- update: fix display of installed version; ...
+	curiously it was only broken on ARM_HARDWARE
+
+	- infoviewer: fix radiotext icon for webradio
+
+	- neutrino: fix console output to signalize timer wakeups
+
+2017-11-16  Striper  <gandharva@gmx.de>
+
+	- capmt.cpp: cleanup
+	 Conflicts:
+		src/zapit/src/capmt.cpp
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- infoviewer_bb: fix wrong mode-logic for radiotext icon
+
+2017-11-16  Striper  <gandharva@gmx.de>
+
+	- shorten string
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- movieplayer: fix screenshot function
+
+	- screenshot: cleanup from many many unused code; ...
+	This commit reverts screenshot code to a stand before hd51 support. Screenshots for ARM_HARDWARE will be re-implemented in another way.
+
+	- cleanup from unsupported DUCKBOX_HARDWARE
+
+	- streaminfo2: cleanup from unsupported hardware ifdefs
+
+	- vfd: cleanup from unsupported hardware ifdefs; vfd.cpp/h is only used by COOL_HARDWARE
+	 Conflicts:
+		src/driver/vfd.cpp
+
+	- movieplayer: cleanup from unsupported hardware ifdefs
+
+	- re-add working streaminfo for coolstream hardware; ...
+	TODO fix streaminfo2 for coolstream; was broken since last commits
+
+2017-11-16  TangoCash  <eric@loxat.de>
+
+	- infoviewer: fix FIXME comment in 9b340752244980a59d57d3d318f70339a7f8d2e1
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- movieplayer: don't stop playback with RC_home; it's confusing
+	 Conflicts:
+		src/gui/movieplayer.cpp
+
+	- neutrino: don't add web-channels to sat-bouquet
+
+	- streaminfo: fix compile for coolstream; add dummies to libcs-headers
+
+	- streaminfo: some more position fixes; ...
+	use COL_MENUCONTENTINACTIVE_TEXT for inactive apids and caids
+
+	- streaminfo: add channelname for webtv/radio too; simplify code
+
+	- streaminfo: re-add osd resolution
+
+	- locale: minor changes in streaminfo locales
+
+	- streaminfo: use OFFSET defines; some position fixes
+
+2017-11-16  Thilo Graf  <dbt@novatux.de>
+
+	- streaminfo: minor re-formatations and whitespace cleanups
+	# Conflicts:
+	#	src/gui/streaminfo2.cpp
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- streaminfo: show channellogo in mode-webradio too
+
+	- streaminfo: port from TangoCash
+	 Conflicts:
+		src/gui/streaminfo2.cpp
+
+	- streaminfo: fix resolution for webradio; ...
+	add channellogo to movieplayer-info too; not nice but informative
+
+	- streaminfo: some mode_webradio fixes
+
+	- neutrino: some more mode_radio/mode_webradio fixes #2
+
+	- neutrino: some more mode_radio/mode_webradio fixes
+
+	- neutrino: respect user's infoviewer timeout settings for different modes
+
+	- infoviewer: try to get meta data from stream when epg is empty
+
+	- infoviewer_bb: fix display of icons in radio/webradio mode
+
+	- movieplayer: add some console spam to check modes
+
+	- infoviewer: try to fix showLivestreamInfo() for audiostreams
+
+2017-11-16  Striper  <gandharva@gmx.de>
+
+	- yweb: optimize png images for size
+	 Conflicts:
+		data/y-web/images/blank.png
+		data/y-web/images/cancel.png
+		data/y-web/images/colored_bar.png
+		data/y-web/images/server_add.png
+		data/y-web/images/server_delete.png
+		data/y-web/images/server_edit.png
+		data/y-web/images/server_link.png
+
+	- yweb: install only box specific remote control pictures
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- media-menu: disable currently broken audioplayer for ARM_HARDWARE
+
+	- fill webradio_usr.xml with some of my favorite streams
+
+	- zapit: save last channel for webradio too
+
+	- infoviewer: fix timeout for new mode_webradio
+
+	- try to fix tv <-> radio switch
+
+	- zapit: don't save webradio-channels as last tv channel
+
+	- movieplayer: fix for '- movieplayer: fix new mode'
+
+	- movieplayer: rename isWebTV => isWebChannel
+
+	- rename LIST_MODE_WEBTV => LIST_MODE_WEB
+
+	- scanepg: rename webtv => webchan
+
+	- rename IS_WEBTV => IS_WEBCHAN
+	 Conflicts:
+		src/zapit/src/capmt.cpp
+
+	- movieplayer: fix new mode
+
+	- fix mode in SetChannelMode()
+
+	- fix -Wlogical-op errors
+
+	- add webradio; first steps
+	 Conflicts:
+		data/Makefile.am
+		data/scripts/backup.sh
+		src/neutrino.cpp
+		src/zapit/include/zapit/zapit.h
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- tuxtxt: change some default values
+
+	This should be bounded to current loacle settings.
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- tuxtxt: fix compiler warnings; simplify ifdef's
+
+	- tuxtxt: align to mp
+
+	fix generic keyboard
+	 Conflicts:
+		src/driver/rcinput.cpp
+
+2017-11-16  Striper  <gandharva@gmx.de>
+
+	- fix compile for coolstream hardware (works on HD2)
+	 Conflicts:
+		src/driver/screenshot.cpp
+
+2017-11-16  svenhoefer  <svenhoefer@svenhoefer.com>
+
+	- acinclude: fix indentation
+
+2017-11-16  Thilo Graf  <dbt@novatux.de>
+
+	CServiceManager: add member GetCurrentChannel()
+	Shortcut for CZapit::getInstance()->GetCurrentChannel() inside
+	CServiceManager
+
+	widget/menue_target.h: add possible required includes
+	If this file is included as single without menue.h build could be break,
+	beecause of missing includes for some types. This should fix this.
+	In many source files still menue.h is included, so this is not noticeable.
+
+2017-11-13  TangoCash  <eric@loxat.de>
+
+	hd51: fix wakeup from standby
+
+2017-11-13  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	fix audio description after play movie
+
+2017-11-07  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	src/gui/movieplayer.cpp fix break record after play on cst (after hd51 merge)
+
+	src/zapit/src/capmt.cpp dont stop decoding if record stops, this break overlapped record on cst
+
+2017-11-06  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	src/gui/movieplayer.cpp fix audioselect in not filpeplayer mode (after merge)
+
+2017-11-05  GetAway  <get-away@t-online.de>
+
+	menue.cpp: add reverse search to find selectable item
+
+2017-11-05  Thilo Graf  <dbt@novatux.de>
+
+	CImageInfo: fix version string format
+	String was broken. Only artefacts were to see.
+
+	BTW: With current yocto build .version contains
+	wrong version format. This seems to be not suitable for
+	handling with flash images in context with versions checks.
+
+2017-11-05  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	disable file player mode for cst
+
+2017-11-04  Thilo Graf  <dbt@novatux.de>
+
+	simple_display.cpp: partial revert "fix generic build"
+	This reverts commit c7c52324a39c3b65e21b35d9983f26e95efa6537.
+
+	hd51 build was broken with -Werror=unused-variable
+
+2017-11-03  Jacek Jendrzej  <satbaby@kawaii.com>
+
+	silence -Wparentheses-equality warning
+
+	fix generic build
+
+	remove pinentered script , revert 9dbdfcf5c7e813c67f44b3255881fd0fe344ad4d
+
+	fix blank screen on start (after merge)
+
+	remove unused
+
+	src/gui/movieplayer.cpp reEnable YT
+
+	src/gui/movieplayer.cpp fix page up/down jump and stop play after merge
+
 2017-11-02  Thilo Graf  <dbt@novatux.de>
 
 	update version to 3.6.1

acinclude.m4

@@ -1,41 +1,42 @@
-AC_DEFUN([TUXBOX_APPS],[
+AC_DEFUN([TUXBOX_APPS], [
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 AC_GNU_SOURCE
 
 AC_ARG_WITH(target,
-	[  --with-target=TARGET    target for compilation [[native,cdk]]],
-	[TARGET="$withval"],[TARGET="native"])
+	AS_HELP_STRING([--with-target=TARGET], [target for compilation [[native,cdk]]]),
+	[TARGET="$withval"],
+	[TARGET="native"])
 
 AC_ARG_WITH(targetprefix,
-	[  --with-targetprefix=PATH  prefix relative to target root (only applicable in cdk mode)],
-	[TARGET_PREFIX="$withval"],[TARGET_PREFIX=""])
+	AS_HELP_STRING([--with-targetprefix=PATH], [prefix relative to target root (only applicable in cdk mode)]),
+	[TARGET_PREFIX="$withval"],
+	[TARGET_PREFIX=""])
 
 AC_ARG_WITH(debug,
-	[  --without-debug         disable debugging code],
-	[DEBUG="$withval"],[DEBUG="yes"])
+	AS_HELP_STRING([--without-debug], [disable debugging code @<:@default=no@:>@]),
+	[DEBUG="$withval"],
+	[DEBUG="yes"])
 
 if test "$DEBUG" = "yes"; then
 	DEBUG_CFLAGS="-g3 -ggdb"
-	AC_DEFINE(DEBUG,1,[Enable debug messages])
+	AC_DEFINE(DEBUG, 1, [enable debugging code])
 fi
 
 AC_ARG_WITH(libcoolstream-static-dir,
-	[  --with-libcoolstream-static-dir=PATH  path for static libcoolstream],
-	[LIBCOOLSTREAM_STATIC_DIR="$withval"],[LIBCOOLSTREAM_STATIC_DIR=""])
+	AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path for static libcoolstream [[NONE]]]),
+	[LIBCOOLSTREAM_STATIC_DIR="$withval"],
+	[LIBCOOLSTREAM_STATIC_DIR=""])
 
 AC_ARG_ENABLE(libcoolstream-static,
-	AS_HELP_STRING(--enable-libcoolstream-static,[libcoolstream static linked for testing]))
-AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC,test "$enable_libcoolstream_static" = "yes")
+	AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@]))
+AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes")
 
 AC_ARG_ENABLE(reschange,
-       AS_HELP_STRING(--enable-reschange,enable change the osd resolution (default for hd2)))
-
-AM_CONDITIONAL(ENABLE_RESCHANGE,test "$enable_reschange" = "yes")
-if test "$enable_reschange" = "yes"; then
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
-fi
+	AS_HELP_STRING([--enable-reschange], [enable change the osd resolution @<:@default for hd2 and hd51@:>@]),
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]))
+AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes")
 
 AC_MSG_CHECKING(target)
 
@@ -49,11 +50,12 @@ if test "$TARGET" = "native"; then
 	if test "$prefix" = "NONE"; then
 		prefix=/usr/local
 	fi
-	TARGET_PREFIX=$prefix
 	if test "$exec_prefix" = "NONE"; then
 		exec_prefix=$prefix
 	fi
 	targetprefix=$prefix
+	TARGET_PREFIX=$prefix
+	AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix])
 elif test "$TARGET" = "cdk"; then
 	AC_MSG_RESULT(cdk)
 
@@ -67,7 +69,7 @@ elif test "$TARGET" = "cdk"; then
 		AC_MSG_ERROR([invalid prefix, you need to specify one in cdk mode])
 	fi
 	if test "$TARGET_PREFIX" != "NONE"; then
-		AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX",[The targets prefix])
+		AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix])
 	fi
 	if test "$TARGET_PREFIX" = "NONE"; then
 		AC_MSG_ERROR([invalid targetprefix, you need to specify one in cdk mode])
@@ -82,16 +84,16 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_SYS_LARGEFILE
 
-check_path () {
+check_path() {
 	return $(perl -e "if(\"$1\"=~m#^/usr/(local/)?bin#){print \"0\"}else{print \"1\";}")
 }
 
 ])
 
 dnl expand nested ${foo}/bar
-AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
+AC_DEFUN([TUXBOX_EXPAND_VARIABLE], [
+	__$1="$2"
 	for __CNT in false false false false true; do dnl max 5 levels of indirection
-
 		$1=`eval echo "$__$1"`
 		echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable
 		__$1="${$1}"
@@ -99,8 +101,8 @@ AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
 	$__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand
 ])
 
-AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[
-AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
+AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE], [
+AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [
 	_$2=$withval
 	if test "$TARGET" = "cdk"; then
 		$2=`eval echo "$TARGET_PREFIX$withval"` # no indirection possible IMNSHO
@@ -108,7 +110,7 @@ AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
 		$2=$withval
 	fi
 	TARGET_$2=${$2}
-],[
+], [
 	# RFC 1925: "you can always add another level of indirection..."
 	TUXBOX_EXPAND_VARIABLE($2,"${$3}$5")
 	if test "$TARGET" = "cdk"; then
@@ -118,13 +120,12 @@ AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
 	fi
 	TARGET_$2=$_$2
 ])
-
 dnl AC_SUBST($2)
 AC_DEFINE_UNQUOTED($2,"$_$2",$7)
 AC_SUBST(TARGET_$2)
 ])
 
-AC_DEFUN([TUXBOX_APPS_DIRECTORY],[
+AC_DEFUN([TUXBOX_APPS_DIRECTORY], [
 AC_REQUIRE([TUXBOX_APPS])
 
 if test "$TARGET" = "cdk"; then
@@ -142,71 +143,71 @@ else
 	mntdir="/mnt" # hack
 fi
 
-TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config,
-	[--with-configdir=PATH         ],[where to find the config files])
+TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/config,
+	[--with-configdir=PATH], [where to find config files])
 
-TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,/tuxbox,
-	[--with-datadir=PATH           ],[where to find data])
+TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox,
+	[--with-datadir=PATH], [where to find data files])
 
-TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
-	[--with-fontdir=PATH           ],[where to find the fonts])
+TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts,
+	[--with-fontdir=PATH], [where to find fonts])
 
-TUXBOX_APPS_DIRECTORY_ONE(fontdir_var,FONTDIR_VAR,localstatedir,/var,/tuxbox/fonts,
-	[--with-fontdir_var=PATH       ],[where to find the fonts in /var])
+TUXBOX_APPS_DIRECTORY_ONE(fontdir_var, FONTDIR_VAR, localstatedir, /var, /tuxbox/fonts,
+	[--with-fontdir_var=PATH], [where to find fonts in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
-	[--with-gamesdir=PATH          ],[where games data is stored])
+TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games,
+	[--with-gamesdir=PATH], [where to find games])
 
-TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
-	[--with-libdir=PATH            ],[where to find the internal libs])
+TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox,
+	[--with-libdir=PATH], [where to find internal libs])
 
-TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
-	[--with-plugindir=PATH         ],[where to find the plugins])
+TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins,
+	[--with-plugindir=PATH], [where to find plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins,
-	[--with-plugindir_var=PATH     ],[where to find the plugins in /var])
+TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tuxbox/plugins,
+	[--with-plugindir_var=PATH], [where to find plugins in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/plugins/webtv,
-	[--with-webtvdir_var=PATH      ],[where to find the livestreamScriptPath in /var])
+TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
+	[--with-plugindir_mnt=PATH], [where to find external plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(webtvdir,WEBTVDIR,datadir,/share,/tuxbox/neutrino/webtv,
-	[--with-webtvdir=PATH          ],[where to find the webtv content])
+TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins,
+	[--with-luaplugindir=PATH], [where to find Lua plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins,
-	[--with-plugindir_mnt=PATH     ],[where to find the the extern plugins])
+TUXBOX_APPS_DIRECTORY_ONE(webtvdir, WEBTVDIR, datadir, /share, /tuxbox/neutrino/webtv,
+	[--with-webtvdir=PATH], [where to find webtv content])
 
-TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins,
-	[--with-luaplugindir=PATH      ],[where to find Lua plugins])
+TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var, WEBTVDIR_VAR, localstatedir, /var, /tuxbox/webtv,
+	[--with-webtvdir_var=PATH], [where to find webtv content in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale,
-	[--with-localedir=PATH         ],[where to find the locale])
+TUXBOX_APPS_DIRECTORY_ONE(localedir, LOCALEDIR,datadir, /share, /tuxbox/neutrino/locale,
+	[--with-localedir=PATH], [where to find locale])
 
-TUXBOX_APPS_DIRECTORY_ONE(localedir_var,LOCALEDIR_VAR,localstatedir,/var,/tuxbox/locale,
-	[--with-localedir_var=PATH     ],[where to find the locale in /var])
+TUXBOX_APPS_DIRECTORY_ONE(localedir_var, LOCALEDIR_VAR, localstatedir, /var, /tuxbox/locale,
+	[--with-localedir_var=PATH], [where to find locale in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes,
-	[--with-themesdir=PATH         ],[where to find the themes])
+TUXBOX_APPS_DIRECTORY_ONE(themesdir, THEMESDIR, datadir, /share, /tuxbox/neutrino/themes,
+	[--with-themesdir=PATH], [where to find themes])
 
-TUXBOX_APPS_DIRECTORY_ONE(themesdir_var,THEMESDIR_VAR,localstatedir,/var,/tuxbox/themes,
-	[--with-themesdir_var=PATH     ],[where to find the themes in /var])
+TUXBOX_APPS_DIRECTORY_ONE(themesdir_var, THEMESDIR_VAR, localstatedir, /var, /tuxbox/themes,
+	[--with-themesdir_var=PATH], [where to find themes in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons,
-	[--with-iconsdir=PATH          ],[where to find the icons])
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/icons,
+	[--with-iconsdir=PATH], [where to find icons])
 
-TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var,ICONSDIR_VAR,localstatedir,/var,/tuxbox/icons,
-	[--with-iconsdir_var=PATH      ],[where to find the icons in /var])
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var, ICONSDIR_VAR, localstatedir, /var, /tuxbox/icons,
+	[--with-iconsdir_var=PATH], [where to find icons in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(private_httpddir,PRIVATE_HTTPDDIR,datadir,/share,/tuxbox/neutrino/httpd,
-	[--with-private_httpddir=PATH  ],[where to find the the private httpd files])
+TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd,
+	[--with-private_httpddir=PATH], [where to find private httpd files])
 
-TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/tuxbox/httpd,
-	[--with-public_httpddir=PATH   ],[where to find the the public httpd files])
+TUXBOX_APPS_DIRECTORY_ONE(public_httpddir, PUBLIC_HTTPDDIR, localstatedir, /var, /tuxbox/httpd,
+	[--with-public_httpddir=PATH], [where to find public httpd files])
 
-TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted,
-	[--with-hosted_httpddir=PATH   ],[where to find the the hosted files])
+TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir, HOSTED_HTTPDDIR, mntdir, /mnt, /hosted,
+	[--with-hosted_httpddir=PATH], [where to find hosted files])
 
-TUXBOX_APPS_DIRECTORY_ONE(flagdir,FLAGDIR,localstatedir,/var,/etc,
-	[--with-flagdir=PATH           ],[where to find flagfiles])
+TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc,
+	[--with-flagdir=PATH], [where to find flag files])
 ])
 
 dnl automake <= 1.6 needs this specifications
@@ -214,16 +215,15 @@ AC_SUBST(CONFIGDIR)
 AC_SUBST(DATADIR)
 AC_SUBST(FONTDIR)
 AC_SUBST(FONTDIR_VAR)
-AC_SUBST(FLAGDIR)
 AC_SUBST(GAMESDIR)
 AC_SUBST(LIBDIR)
 AC_SUBST(MNTDIR)
 AC_SUBST(PLUGINDIR)
 AC_SUBST(PLUGINDIR_VAR)
-AC_SUBST(WEBTVDIR)
-AC_SUBST(WEBTVDIR_VAR)
 AC_SUBST(PLUGINDIR_MNT)
 AC_SUBST(LUAPLUGINDIR)
+AC_SUBST(WEBTVDIR)
+AC_SUBST(WEBTVDIR_VAR)
 AC_SUBST(LOCALEDIR)
 AC_SUBST(LOCALEDIR_VAR)
 AC_SUBST(THEMESDIR)
@@ -235,7 +235,7 @@ AC_SUBST(PUBLIC_HTTPDDIR)
 AC_SUBST(HOSTED_HTTPDDIR)
 dnl end workaround
 
-AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG],[
+AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG], [
 AC_PATH_PROG($1_CONFIG,$2,no)
 if test "$$1_CONFIG" != "no"; then
 	if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then
@@ -255,23 +255,22 @@ if test "$$1_CONFIG" != "no"; then
 		fi
 	fi
 fi
-
 AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 
-AC_DEFUN([TUXBOX_APPS_LIB_CONFIG],[
+AC_DEFUN([TUXBOX_APPS_LIB_CONFIG], [
 _TUXBOX_APPS_LIB_CONFIG($1,$2,ERROR)
 if test "$$1_CONFIG" = "no"; then
 	AC_MSG_ERROR([could not find $2]);
 fi
 ])
 
-AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK],[
+AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK], [
 _TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
 ])
 
-AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[
+AC_DEFUN([TUXBOX_APPS_PKGCONFIG], [
 m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
@@ -283,7 +282,7 @@ if test x"$PKG_CONFIG" = x"" ; then
 fi
 ])
 
-AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG],[
+AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG], [
 AC_REQUIRE([TUXBOX_APPS_PKGCONFIG])
 AC_MSG_CHECKING(for package $2)
 if $PKG_CONFIG --exists "$2" ; then
@@ -294,37 +293,38 @@ if $PKG_CONFIG --exists "$2" ; then
 else
 	AC_MSG_RESULT(no)
 fi
-
 AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 
-AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[
+AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG], [
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 if test x"$$1_EXISTS" != xyes; then
 	AC_MSG_ERROR([could not find package $2]);
 fi
 ])
 
-AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK],[
+AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK], [
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 ])
 
-AC_DEFUN([TUXBOX_BOXTYPE],[
+AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	[  --with-boxtype          valid values: tripledragon,coolstream,spark,azbox,generic,armbox],
+	AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]),
 	[case "${withval}" in
 		tripledragon|coolstream|spark|azbox|generic|armbox)
 			BOXTYPE="$withval"
 		;;
 		*)
-			AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;;
-	esac], [BOXTYPE="coolstream"])
+			AC_MSG_ERROR([bad value $withval for --with-boxtype])
+		;;
+	esac],
+	[BOXTYPE="generic"])
 
 AC_ARG_WITH(boxmodel,
-	[  --with-boxmodel         valid for coolstream: hd1, hd2
-			valid for armbox: hd51
-			valid for generic: raspi],
+	AS_HELP_STRING([--with-boxmodel], [valid for coolstream: hd1, hd2])
+AS_HELP_STRING([], [valid for armbox: hd51])
+AS_HELP_STRING([], [valid for generic: raspi]),
 	[case "${withval}" in
 		hd1|hd2)
 			if test "$BOXTYPE" = "coolstream"; then
@@ -362,8 +362,7 @@ AC_ARG_WITH(boxmodel,
 		*)
 			AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
 		;;
-	esac], [test "$BOXTYPE" = "coolstream" && BOXMODEL="hd1" || true]
-	)
+	esac])
 
 AC_SUBST(BOXTYPE)
 AC_SUBST(BOXMODEL)
@@ -375,10 +374,10 @@ AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
 AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
 
-AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1")
-AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2")
+AM_CONDITIONAL(BOXMODEL_CS_HD1, test "$BOXMODEL" = "hd1")
+AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")
 
-AM_CONDITIONAL(BOXMODEL_RASPI,test "$BOXMODEL" = "raspi")
+AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
 
 if test "$BOXTYPE" = "azbox"; then
 	AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox])
@@ -399,32 +398,35 @@ if test "$BOXMODEL" = "hd1"; then
 	AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
 elif test "$BOXMODEL" = "hd2"; then
 	AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
 elif test "$BOXMODEL" = "hd51"; then
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
 elif test "$BOXMODEL" = "raspi"; then
-	AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi])
+	AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
 fi
 ])
 
 dnl backward compatiblity
-AC_DEFUN([AC_GNU_SOURCE],
-[AH_VERBATIM([_GNU_SOURCE],
-[/* Enable GNU extensions on systems that have them.  */
+AC_DEFUN([AC_GNU_SOURCE], [
+AH_VERBATIM([_GNU_SOURCE], [
+/* Enable GNU extensions on systems that have them. */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
-#endif])dnl
+#endif
+])dnl
 AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
 AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 AC_DEFINE([_GNU_SOURCE])
 ])
 
-AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
+AC_DEFUN([AC_PROG_EGREP], [
+AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], [
+if echo a | (grep -E '(a|b)') >/dev/null 2>&1; then
+	ac_cv_prog_egrep='grep -E'
+else
+	ac_cv_prog_egrep='egrep'
+fi
+])
+EGREP=$ac_cv_prog_egrep
+AC_SUBST([EGREP])
 ])

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(Tuxbox-Neutrino,3.6.1)
+AC_INIT(Tuxbox-Neutrino,3.7.0)
 AM_INIT_AUTOMAKE([1.0.1 nostdinc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
@@ -36,23 +36,19 @@ else
 fi
 
 AC_ARG_ENABLE(ffmpegdec,
-	AS_HELP_STRING(--enable-ffmpegdec,include ffmpeg decoder support),
-	,[enable_ffmpegdec=no])
+	AS_HELP_STRING([--enable-ffmpegdec], [enable ffmpeg decoder support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_FFMPEGDEC, 1, [include ffmpeg decoder support]))
+AM_CONDITIONAL(ENABLE_FFMPEGDEC, test "$enable_ffmpegdec" = "yes")
 
-AM_CONDITIONAL(ENABLE_FFMPEGDEC,test "$enable_ffmpegdec" = "yes")
-if test "$enable_ffmpegdec" = "yes"; then
-	AC_DEFINE(ENABLE_FFMPEGDEC,1,[include ffmpeg decoder support])
-fi
+if test "$enable_ffmpegdec" != "yes"; then
 
-if test x"$enable_ffmpegdec" != xyes; then
-
-AC_ARG_WITH([tremor], [AS_HELP_STRING([--with-tremor],
-	[use libvorbisidec instead of libogg/libvorbis])],
+AC_ARG_WITH(tremor,
+	AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]),
 	[TREMOR="$withval"],
 	[TREMOR=no])
 
-AC_ARG_WITH([tremor-static], [AS_HELP_STRING([--with-tremor-static],
-	[use statically linked libvorbisidec instead of libogg/libvorbis])],
+AC_ARG_WITH(tremor-static,
+	AS_HELP_STRING([--with-tremor-static], [use statically linked libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]),
 	[TREMOR_STATIC="$withval"],
 	[TREMOR_STATIC=no])
 
@@ -62,7 +58,7 @@ fi
 
 if test "$TREMOR" = "yes"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(VORBISIDEC,vorbisidec)
-	AC_DEFINE(USE_TREMOR,1,use libvorbisidec/tremor library)
+	AC_DEFINE(USE_TREMOR, 1, use libvorbisidec/tremor library)
 fi
 
 if test "$TREMOR_STATIC" = "yes"; then
@@ -84,35 +80,34 @@ TUXBOX_APPS_LIB_PKGCONFIG_CHECK(OGG,ogg)
 if test -z "$OGG_CFLAGS" ; then
 	TUXBOX_APPS_LIB_PKGCONFIG(OGG,ogg)
 fi
+
+fi # test "$enable_ffmpegdec"
+
 TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
-else
-TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
-fi
+
+AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
 
 if test "$BOXTYPE" = "tripledragon"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)
 fi
 
-AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
-
 # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
 TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
 
 ## For the check you must use the corresponding libtool number as version number,
 ## see freetype source code docs/VERSIONS.TXT
-PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10],
-	[echo "freetype2 >= 2.5.0 found"], [
-	## If freetype is not found:
-	## Activate this line if you want to search with freetype-config instead
-	[echo "freetype2 >= 2.5.0 not found, use alternative search method with freetype-config"]
-	## Activate this line if you want to abort
-#	AC_MSG_ERROR([freetype2 >= 2.5.0 not found])
-	])
+PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10], [
+	echo "freetype2 >= 2.5.0 found"
+], [
+	echo "freetype2 >= 2.5.0 not found, use alternative search method with freetype-config"
+	#AC_MSG_ERROR([freetype2 >= 2.5.0 not found])
+])
 
 # fallback to curl-config (which is ugly for cross-compilation)
 if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then
 	TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
 fi
+
 # fallback to freetype-config (which is ugly for cross-compilation)
 if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then
 	TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
@@ -124,9 +119,10 @@ if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then
 		#if FREETYPE_MAJOR < 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR < 5)
 		#error Freetype version too low.
 		#endif
-			],
-			[AC_MSG_RESULT(yes)],
-			[AC_MSG_ERROR([Need FreeType library version 2.5.0 or higher])
+	], [
+		AC_MSG_RESULT(yes)
+	], [
+		AC_MSG_ERROR([Need FreeType library version 2.5.0 or higher])
 	])
 fi
 
@@ -134,6 +130,12 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
 TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
 TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
+TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
+
+if test "$BOXTYPE" = "armbox"; then
+	TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
+fi
+
 if test "$BOXTYPE" = "coolstream"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
 fi
@@ -142,171 +144,140 @@ if test "$BOXTYPE" = "coolstream" ||
    test "$BOXTYPE" = "generic" ||
    test "$BOXTYPE" = "tripledragon" ||
    test "$BOXTYPE" = "spark"; then
-	AC_DEFINE(SCREENSHOT,1,[Define to 1 if the platform supports screenshots])
+	AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots])
 fi
 
-TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
-
-#TUXBOX_APPS_LIB_PKGCONFIG(CONFIGFILE,tuxbox-configfile)
-#TUXBOX_APPS_LIB_PKGCONFIG(CONNECTION,tuxbox-connection)
-#TUXBOX_APPS_LIB_PKGCONFIG(EVENTSERVER,tuxbox-eventserver)
-#TUXBOX_APPS_LIB_PKGCONFIG(LCDDISPLAY,tuxbox-lcddisplay)
-#TUXBOX_APPS_LIB_PKGCONFIG(LIRCDCLIENT,tuxbox-lircdclient)
-#TUXBOX_APPS_LIB_PKGCONFIG(NET,tuxbox-net)
-#TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins)
-#TUXBOX_APPS_LIB_PKGCONFIG(TUXBOX,tuxbox)
-#TUXBOX_APPS_LIB_PKGCONFIG(UCODES,tuxbox-ucodes)
-#TUXBOX_APPS_LIB_PKGCONFIG(MPEGTOOLS,tuxbox-mpegtools)
-#TUXBOX_APPS_LIB_PKGCONFIG(TUXTXT,tuxbox-tuxtxt)
-
 AC_ARG_ENABLE(keyboard-no-rc,
-         [  --enable-keyboard-no-rc             enable keyboard control, disable rc control],
-         [AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL,1,[enable keyboard control, disable rc control])])
+	AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]),
+	AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control]))
 
 AC_ARG_ENABLE(mdev,
-	[  --enable-mdev disable broken neutrino mount hack, use with mdev],
-	[AC_DEFINE(ASSUME_MDEV,1,[disable broken neutrino mount hack, use with mdev])])
+	AS_HELP_STRING([--enable-mdev], [use mdev instead of broken neutrino mount hack @<:@default=no@:>@]),
+	AC_DEFINE(ASSUME_MDEV, 1, [use mdev instead of broken neutrino mount hack]))
 
 AC_ARG_ENABLE(freesatepg,
-	[  --enable-freesatepg                  enable Freesat EPG code (experimental)],
-	[AC_DEFINE(ENABLE_FREESATEPG,1,[enable Freesat EPG code])])
+	AS_HELP_STRING([--enable-freesatepg], [enable Freesat EPG code @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_FREESATEPG, 1, [enable Freesat EPG code]))
 
 AC_ARG_ENABLE(viasatepg,
-	[  --enable-viasatepg                  enable ViaSat EPG code (experimental)],
-	[AC_DEFINE(ENABLE_VIASATEPG,1,[enable ViaSat EPG code])])
+	AS_HELP_STRING([--enable-viasatepg], [enable ViaSat EPG code @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_VIASATEPG, 1, [enable ViaSat EPG code]))
 
 AC_ARG_ENABLE(fastscan,
-	[  --enable-fastscan                   enable Fastscan code)],
-	[AC_DEFINE(ENABLE_FASTSCAN,1,[enable fastscan code])])
-
+	AS_HELP_STRING([--enable-fastscan], [enable fastscan code @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_FASTSCAN, 1, [enable fastscan code]))
 AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes")
 
 AC_ARG_ENABLE(giflib,
-	AS_HELP_STRING(--enable-giflib,use giflib instead of libungif),
-	,[enable_giflib=no])
+	AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_GIFLIB, 1, [use giflib instead of libungif]))
+AM_CONDITIONAL(ENABLE_GIFLIB, test "$enable_giflib" = "yes")
 
-AM_CONDITIONAL(ENABLE_GIFLIB,test "$enable_giflib" = "yes")
-if test "$enable_giflib" = "yes"; then
-	AC_DEFINE(ENABLE_GIFLIB,1,[use giflib instead of libungif])
-fi
-
-### USE_PUGIXML
 AC_ARG_ENABLE(pugixml,
-       AS_HELP_STRING(--enable-pugixml,use pugixml instead of xmltree),
-       ,[enable_pugixml=no])
+	AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree @<:@default=no@:>@]),
+	AC_DEFINE(USE_PUGIXML, 1, [use pugixml instead of xmltree]))
+AM_CONDITIONAL(USE_PUGIXML, test "$enable_pugixml" = "yes")
 
-AM_CONDITIONAL(USE_PUGIXML,test "$enable_pugixml" = "yes")
-if test "$enable_pugixml" = "yes"; then
-       AC_DEFINE(USE_PUGIXML,1,[use pugixml instead of xmltree])
-fi
-
-
-# FLAC - Free Lossless Audio Codec
 AC_ARG_ENABLE(flac,
-	AS_HELP_STRING(--enable-flac,include FLAC support),
-	,[enable_flac=no])
+	AS_HELP_STRING([--enable-flac], [enable FLAC support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_FLAC, 1, [enable FLAC support]))
+AM_CONDITIONAL(ENABLE_FLAC, test "$enable_flac" = "yes")
 
-AM_CONDITIONAL(ENABLE_FLAC,test "$enable_flac" = "yes")
-if test "$enable_flac" = "yes"; then
-	AC_DEFINE(ENABLE_FLAC,1,[include FLAC support])
-fi
-
-# UPNP - upnp browser (borken right now)
 AC_ARG_ENABLE(upnp,
-	AS_HELP_STRING(--disable-upnp,disable UPNP support),
-	,[enable_upnp=yes])
+	AS_HELP_STRING([--enable-upnp], [enable UPNP support @<:@default=yes@:>@]),
+	[enable_upnp="$enableval"],
+	[enable_upnp="yes"])
 
-AM_CONDITIONAL(ENABLE_UPNP,test "$enable_upnp" = "yes")
 if test "$enable_upnp" = "yes"; then
-	AC_DEFINE(ENABLE_UPNP,1,[include UPNP support - currently broken])
+	AC_DEFINE(ENABLE_UPNP, 1, [enable UPNP support])
 fi
+AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes")
 
 AC_ARG_ENABLE(extupdate,
-	AS_HELP_STRING(--enable-extupdate,include extended update routine),
-	,[enable_extupdate=no])
+	AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine]))
+AM_CONDITIONAL(ENABLE_EXTUPDATE, test "$enable_extupdate" = "yes")
 
-AM_CONDITIONAL(ENABLE_EXTUPDATE,test "$enable_extupdate" = "yes")
-if test "$enable_extupdate" = "yes"; then
-	AC_DEFINE(ENABLE_EXTUPDATE,1,[include extended update routine])
+AC_ARG_ENABLE(lua,
+	AS_HELP_STRING([--enable-lua], [enable Lua support @<:@default=yes@:>@]),
+	[enable_lua="$enableval"],
+	[enable_lua="yes"])
+
+if test "$enable_lua" = "yes"; then
+	AC_DEFINE(ENABLE_LUA, 1, [include Lua support])
+	PKG_CHECK_MODULES([LUA], [lua >= 5.2], [
+		echo "lua >= 5.2 found"
+	], [
+		PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], [
+			echo "lua5.2 found"
+		], [
+			echo "lualib not found, assuming static lua in linker path..."
+			LUA_LIBS="-llua -ldl"
+			AC_DEFINE(STATIC_LUAPOSIX, 1, [Define to 1 for static lua build.])
+		])
+	])
+	# hack...
+	AC_DEFINE(LUA_COMPAT_5_2, 1, [does not really belong in config.h, but is needed for build with lua 5.3+])
 fi
+AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes")
+
+AC_ARG_ENABLE(cleanup,
+	AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit @<:@default=no@:>@]),
+	AC_DEFINE(EXIT_CLEANUP, 1, [enable cleanup on exit]))
+
+AC_ARG_ENABLE(pip,
+	AS_HELP_STRING([--enable-pip], [enable picture in picture support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_PIP, 1, [enable picture in picture support]))
+
+AC_ARG_ENABLE(testing,
+	AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_TESTING, 1, [enable development code]))
+AM_CONDITIONAL(ENABLE_TESTING, test "$enable_testing" = "yes")
+
+AC_ARG_ENABLE(fribidi,
+	AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support]))
+AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes")
 
 AC_ARG_WITH(stb-hal-includes,
-	[  --with-stb-hal-includes=PATH  path for libstb-hal includes [[NONE]]],
-	[STB_HAL_INC="$withval"],[STB_HAL_INC=""])
-AC_ARG_WITH(stb-hal-build,
-	[  --with-stb-hal-build=PATH   path where libstb-hal is built [[NONE]]],
-	[STB_HAL_LIB="-L$withval"],[STB_HAL_LIB=""])
+	AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]),
+	[STB_HAL_INC="$withval"],
+	[STB_HAL_INC=""])
+
+AC_ARG_WITH(stb-hal-build,
+	AS_HELP_STRING([--with-stb-hal-build=PATH], [path where libstb-hal is built [[NONE]]]),
+	[STB_HAL_LIB="-L$withval"],
+	[STB_HAL_LIB=""])
 
-AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
 if test "$BOXTYPE" != coolstream; then
-	AC_DEFINE(USE_STB_HAL, 1,[use libstb-hal])
+	AC_DEFINE(USE_STB_HAL, 1, [use libstb-hal])
 	if test "$STB_HAL_INC" = ""; then
 		AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...])
 	fi
 	HWLIB_CFLAGS="-I$STB_HAL_INC"
 fi
-
-# Lua - embeddable scripting language
-AC_ARG_ENABLE(lua,
-	AS_HELP_STRING(--disable-lua,disable Lua support),
-	,[enable_lua=yes])
-
-AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes")
-if test "$enable_lua" = "yes"; then
-	AC_DEFINE(ENABLE_LUA,1,[include Lua support])
-	PKG_CHECK_MODULES([LUA], [lua >= 5.2], echo "lua >= 5.2 found", [
-		PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], echo "lua5.2 found", [
-			echo "=> lualib not found, assuming static lua in linker path..."
-			LUA_LIBS="-llua -ldl"
-			AC_DEFINE(STATIC_LUAPOSIX,1,[Define to 1 for static lua build.])
-		])
-	])
-# hack...
-AC_DEFINE(LUA_COMPAT_5_2,1,[does not really belong in config.h, but is needed for build with lua 5.3+])
-fi
-
-AC_ARG_ENABLE(cleanup,
-	[  --enable-cleanup                  enable cleanup on exit],
-	[AC_DEFINE(EXIT_CLEANUP,1,[enable cleanup on exit])])
-
-AC_ARG_ENABLE(pip,
-	[  --enable-pip                  enable picture in picture support],
-	[AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])])
-
-
-AC_ARG_ENABLE(testing,
-       AS_HELP_STRING(--enable-testing,include devel code parts for neutrino tests))
-
-AM_CONDITIONAL(ENABLE_TESTING,test "$enable_testing" = "yes")
-if test "$enable_testing" = "yes"; then
-	AC_DEFINE(ENABLE_TESTING,1,[include devel code parts for neutrino tests - not recommended for general users!])
-fi
-
-AC_ARG_ENABLE([fribidi],
-	AS_HELP_STRING([--enable-fribidi], [enable fribidi support])
-)
-AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes")
-AS_IF([test "$enable_fribidi" = "yes"],
-	AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support])
-)
+AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
 
 if test "$BOXTYPE" = "coolstream"; then
-if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then
-	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
-fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream'
+	if test "$BOXMODEL" = "hd1"; then
+		if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then
+			AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H, 1, [Define to 1 if you have the <nevis_ir.h> header file.])
+		fi
+		HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream'
+	fi
 
-if test "$BOXMODEL" = "hd2"; then
-if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h; then
-	AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
-fi
-if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h; then
-	AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.])
-fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream'
-fi
-HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/src/zapit/include/private'
-HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream'
+	if test "$BOXMODEL" = "hd2"; then
+		if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h; then
+			AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H, 1, [Define to 1 if you have the <cs_ir_generic.h> header file.])
+		fi
+		if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h; then
+			AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H, 1, [Define to 1 if you have the <cs_frontpanel.h> header file.])
+		fi
+		HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream'
+	fi
+
+	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/src/zapit/include/private'
+	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream'
 fi
 
 # hack, so that framebuffer.h does not need to be included everywhere...

data/Makefile.am

@@ -19,5 +19,6 @@ endif
 configdir = $(CONFIGDIR)
 config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml settingsupdate.conf terrestrial.xml bad_package_pattern.list.sample
 
+config_DATA += epglanguages.conf webtv_usr.xml webradio_usr.xml
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit

data/cables.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <cables>
-	<cable name="KMS Muenchen" satfeed="true" flags="9">
+	<cable name="KMS M<EFBFBD>nchen" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -79,7 +79,7 @@
 		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
-	<cable name="KMS Nuernberg" satfeed="true" flags="9">
+	<cable name="KMS N<EFBFBD>rnberg" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -485,7 +485,7 @@
 		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
-	<cable name="Goeltzschtalbruecke" satfeed="true" flags="9">
+	<cable name="G<EFBFBD>ltzschtalbr<EFBFBD>cke" satfeed="true" flags="9">
 		<transponder frequency="234000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="242000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="250000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -566,7 +566,7 @@
 		<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="Antennenverein Hohenmoelsen" satfeed="true" flags="9">
+	<cable name="Antennenverein Hohenm<EFBFBD>lsen" 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="3"/>
 		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -1440,6 +1440,54 @@
 		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
+	<cable name="OstTelCom GmbH" satfeed="true" flags="9">
+		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="578000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="650000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="138000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="146000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="154000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="162000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="170000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+	</cable>
 	<cable name="CST Berlin" satfeed="true" flags="9">
 		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

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/iso-codes/Makefile.am

@@ -1,4 +1,4 @@
-installdir = $(datadir)/iso-codes
+installdir = $(DATADIR)/iso-codes
 
 install_DATA = \
 	iso-639.tab

data/locale/deutsch.locale

@@ -4,7 +4,7 @@ EPGMenu.epgplus EPG-Zeitlinen (EPG-Plus)
 EPGMenu.eventinfo Info zur Sendung
 EPGMenu.eventlist Vorschau aktuelles Programm
 EPGMenu.head EPG - Programminformation
-EPGMenu.streaminfo Technische Information
+EPGMenu.streaminfo Technische Informationen
 EPGPlus.actions Aktionen
 EPGPlus.bybouquet_mode bouquetweise
 EPGPlus.bypage_mode seitenweise
@@ -227,6 +227,7 @@ bouquetname.new Neue Kanäle
 bouquetname.other Unbekannter Provider
 bouquetname.removed Gelöschte Kanäle
 bouquetname.uhdtv UHD-Kanäle
+bouquetname.webradio WebRadio-Kanäle
 bouquetname.webtv WebTV-Kanäle
 buildinfo.compiled_on Build Host
 buildinfo.compiled_with Compiler Version
@@ -535,6 +536,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
@@ -884,6 +892,7 @@ lcdmenu.head VFD/LED Einstellungen
 lcdmenu.lcdcontroler Helligkeit
 lcdmenu.notify_rclock Benachrichtigung bei FB-Sperre
 lcdmenu.scroll Laufschrift
+lcdmenu.scroll_repeats Laufschrift und Wiederholungen
 lcdmenu.statusline Statuszeile
 lcdmenu.statusline.both Lautstärke/Fortschritt
 lcdmenu.statusline.playtime Sendungsfortschritt
@@ -920,6 +929,7 @@ mainmenu.games Spiele
 mainmenu.head Hauptmenü
 mainmenu.lua Plugins
 mainmenu.media Multimedia
+mainmenu.mediaplayer Mediaplayer
 mainmenu.movieplayer Movieplayer
 mainmenu.pausesectionsd EPG auslesen
 mainmenu.pictureviewer Bildbetrachter
@@ -1084,7 +1094,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
@@ -1533,8 +1543,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]
@@ -1818,7 +1828,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
@@ -2257,6 +2268,7 @@ servicemenu.restart_refused_recording Aufnahme läuft. Neustart nicht möglich.
 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
@@ -2290,13 +2302,14 @@ streaminfo.audiotype Audiotyp
 streaminfo.audiotype_unknown unbekannt
 streaminfo.average_bitrate Durchschnitt
 streaminfo.bitrate Bitrate
+streaminfo.casystems Cryptsysteme
 streaminfo.framerate Bildrate
 streaminfo.framerate_unknown unbekannt
-streaminfo.head Tech. Information
+streaminfo.head Technische Informationen
 streaminfo.not_available nicht verfügbar
 streaminfo.osd_resolution OSD-Auflösung
 streaminfo.resolution Auflösung
-streaminfo.signal Empfangssignal
+streaminfo.signal Tuner
 streaminfo.videosystem Videosystem
 streaming.busy Einer oder mehrere Aufnahmeprozesse sind aktiv.\nSollte die Aufnahme eigentlich beendet sein,\nschafft ein Neustart der GUI Abhilfe.
 streaming.dir_not_writable Das Aufnahmeverzeichnis ist nicht beschreibbar.\nAufnahmen sind daher nicht möglich.
@@ -2397,6 +2410,11 @@ timing.numericzap Umschalten mit Zifferntasten
 timing.popup_messages Popup Meldungen
 timing.static_messages Interaktive Meldungen
 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.terr Terrestrisch (DVB-T/T2)
 tmdb.api_key TMDb API Schlüssel
 tmdb.enabled TMDb-Unterstützung
 tmdb.read_data Suche TMDb-Daten ...

data/locale/english.locale

@@ -4,7 +4,7 @@ EPGMenu.epgplus EPG-Timelines (EPG-Plus)
 EPGMenu.eventinfo Details current program
 EPGMenu.eventlist Eventlist current programm
 EPGMenu.head EPG - Program information
-EPGMenu.streaminfo Technical information
+EPGMenu.streaminfo Technical informations
 EPGPlus.actions Actions
 EPGPlus.bybouquet_mode by bouquet
 EPGPlus.bypage_mode by page
@@ -227,6 +227,7 @@ bouquetname.new New channels
 bouquetname.other Unknown provider
 bouquetname.removed Removed channels
 bouquetname.uhdtv UHD channels
+bouquetname.webradio WebRadio channels
 bouquetname.webtv WebTV channels
 buildinfo.compiled_on Build Host
 buildinfo.compiled_with Compiler version
@@ -535,6 +536,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
@@ -884,6 +892,7 @@ lcdmenu.head VFD/LED Settings
 lcdmenu.lcdcontroler Brightness
 lcdmenu.notify_rclock Notify when RC is locked
 lcdmenu.scroll Enable text scroll
+lcdmenu.scroll_repeats Enable text scroll and repeats
 lcdmenu.statusline status line
 lcdmenu.statusline.both volume and playtime
 lcdmenu.statusline.playtime playtime
@@ -920,6 +929,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
@@ -1084,7 +1094,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
@@ -1818,7 +1828,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
@@ -2257,6 +2268,7 @@ servicemenu.restart_refused_recording Cant restart, recording in progress
 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
@@ -2284,19 +2296,20 @@ sleeptimerbox.hint2 The STB will shutdown after this time.
 sleeptimerbox.hint3 The STB will shutdown, if remote not used.
 sleeptimerbox.title Sleeptimer
 sleeptimerbox.title2 Inactivity shutdown timer
-streaminfo.aratio Aspect Ratio
+streaminfo.aratio Aspect ratio
 streaminfo.aratio_unknown unknown
 streaminfo.audiotype Audiotype
 streaminfo.audiotype_unknown unknown
 streaminfo.average_bitrate Average
 streaminfo.bitrate Bitrate
+streaminfo.casystems Conditional access systems
 streaminfo.framerate Framerate
 streaminfo.framerate_unknown unknown
-streaminfo.head Stream-Information
+streaminfo.head Technical informations
 streaminfo.not_available not available
 streaminfo.osd_resolution OSD resolution
 streaminfo.resolution Resolution
-streaminfo.signal Receipt signal
+streaminfo.signal Tuner
 streaminfo.videosystem Videosystem
 streaming.busy One or several recording processes are active.\nIf you encounter this message and no recording is active, please restart GUI.
 streaming.dir_not_writable The recording directory is not writable.\nRecording will not work.
@@ -2397,6 +2410,11 @@ timing.numericzap Numeric Zap
 timing.popup_messages Popup messages
 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.terr Terrestrial (DVB-T/T2)
 tmdb.api_key TMDb API key
 tmdb.enabled TMDb support
 tmdb.read_data Search TMDb data ...

data/webradio_usr.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<webradios name="[WebRadio]">
+	<webradio title="80s80s - Main Stream" urlkey="0" url="http://streams.80s80s.de/web/mp3-192/streams.80s80s.de/" description="" genre="80s80s" />
+	<webradio title="80s80s - Bowie" urlkey="0" url="http://streams.80s80s.de/bowie/mp3-192/streams.80s80s.de/" description="" genre="80s80s" />
+	<webradio title="80s80s - Depeche Mode" urlkey="0" url="http://streams.80s80s.de/dm/mp3-192/streams.80s80s.de/" description="" genre="80s80s" />
+	<webradio title="80s80s - Love" urlkey="0" url="http://streams.80s80s.de/love/mp3-192/streams.80s80s.de/" description="" genre="80s80s" />
+	<webradio title="80s80s - Michael Jackson" urlkey="0" url="http://streams.80s80s.de/mj/mp3-192/streams.80s80s.de/" description="" genre="80s80s" />
+	<webradio title="80s80s - NDW" urlkey="0" url="http://streams.80s80s.de/ndw/mp3-192/streams.80s80s.de/" description="" genre="80s80s" />
+	<webradio title="80s80s - Prince" urlkey="0" url="http://streams.80s80s.de/100/mp3-192/streams.80s80s.de/" description="" genre="80s80s" />
+	<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>

data/y-web/images/Makefile.am

@@ -48,16 +48,8 @@ install_DATA =	accept.png \
 		popup.png \
 		properties.png \
 		radio.png \
-		rc_ax_hd51.png \
-		rc_cst_v1.jpg \
-		rc_cst_v2.png \
-		rc_cst_v3.png \
-		rc_cst_v4.png \
-		rc_cst_v5.png \
-		rc_cst_v6.png \
 		rc_dbox_nokia_old.png \
 		rc_dbox_philips.png \
-		rc_mutant_hd51.png \
 		record.png \
 		reload.png \
 		remove.png \
@@ -90,6 +82,20 @@ install_DATA =	accept.png \
 		x_red.png \
 		zap.png
 
+if BOXTYPE_COOL
+install_DATA += rc_cst_v1.jpg \
+		rc_cst_v2.png \
+		rc_cst_v3.png \
+		rc_cst_v4.png \
+		rc_cst_v5.png \
+		rc_cst_v6.png
+endif
+
+if BOXTYPE_ARMBOX
+install_DATA += rc_ax_hd51.png \
+		rc_mutant_hd51.png
+endif
+
 # file manager
 install_DATA +=	chmod.png \
 		copy.gif \