vanhofen 94b4f9a712 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox ...

Conflicts:
	configure.ac
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/rot.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/status/various/lock.png
	data/pictures/backgrounds/1280x720/shutdown.jpg
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/streamts.cpp
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 74aab8ddd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)

2017-11-28 10:31:10 +01:00

..

bedit

rename IS_WEBTV => IS_WEBCHAN

2017-11-16 19:43:26 +01:00

components

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

2017-11-23 17:31:02 +01:00

lua

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

moviebrowser

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

widget

icons.h: cleanup from unused defines

2017-11-27 16:04:43 +01:00

adzap.cpp

src/gui/adzap.cpp init before use

2017-05-23 17:48:15 +02:00

adzap.h

…

audio_select.cpp

cleanup from unsupported DUCKBOX_HARDWARE

2017-11-16 19:43:26 +01:00

audio_select.h

audio_select: copy full code from TangoCash

2017-10-29 18:32:30 +01:00

audio_setup.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-09-23 17:01:42 +02:00

audio_setup.h

…

audiomute.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

audiomute.h

…

audioplayer_setup.cpp

clearify headers for ausioplayer/internetradio setup

2017-08-17 21:49:43 +02:00

audioplayer_setup.h

…

audioplayer.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

audioplayer.h

audioplayer. add streamripper control to record current stream

2017-08-17 21:13:19 +02:00

bookmarkmanager.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-10-01 13:08:15 +02:00

bookmarkmanager.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

bouquetlist.cpp

rename LIST_MODE_WEBTV => LIST_MODE_WEB

2017-11-16 19:43:26 +01:00

bouquetlist.h

bouquetlist: rework; ...

2017-04-13 11:20:10 +02:00

buildinfo.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-08-26 12:58:44 +02:00

buildinfo.h

CBuildinfo: Don't load graphical related objects if not needed.

2017-08-08 14:25:12 +02:00

cam_menu.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-09-13 15:07:03 +02:00

cam_menu.h

remove "using namespace std" from header files

2017-10-02 13:43:57 +02:00

cec_setup.cpp

unify headers in miscsetting's submenus; part 2

2017-09-13 00:01:04 +02:00

cec_setup.h

…

channellist.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

channellist.h

rename LIST_MODE_WEBTV => LIST_MODE_WEB

2017-11-16 19:43:26 +01:00

color_custom.h

…

color.cpp

color: allow to toggle normal <-> enlighten background colors

2017-04-10 21:43:01 +02:00

color.h

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-04-22 17:07:50 +02:00

daemon_control.cpp

some minor renamings

2017-11-09 20:56:57 +01:00

daemon_control.h

move some more stuff from ni-menu to service-menu

2017-09-12 22:30:35 +02:00

dboxinfo.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-10-18 09:41:46 +02:00

dboxinfo.h

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-09 13:19:03 +01:00

epgplus.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-10-01 13:08:15 +02:00

epgplus.h

EpgPlus: update license text

2017-04-25 11:36:49 +02:00

epgview.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

2017-11-03 22:40:43 +01:00

epgview.h

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-05-07 19:05:56 +02:00

eventlist.cpp

rename IS_WEBTV => IS_WEBCHAN

2017-11-16 19:43:26 +01:00

eventlist.h

audioplayer: minor format changes in title box

2017-06-20 11:25:56 +02:00

favorites.cpp

…

favorites.h

…

filebrowser.cpp

movieplayer: align some variables names to tango's names

2017-10-30 01:44:01 +01:00

filebrowser.h

movieplayer: align some variables names to tango's names

2017-10-30 01:44:01 +01:00

followscreenings.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-06-07 15:14:51 +02:00

followscreenings.h

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-09-14 16:23:15 +02:00

hdd_info.cpp

rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

2017-09-29 08:27:42 +02:00

hdd_info.h

…

hdd_menu.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-11-02 23:25:41 +01:00

hdd_menu.h

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-10-02 23:21:37 +02:00

imageinfo_ni.cpp

imageinfo-ni: fix crash on ARM_HARDWARE

2017-10-07 12:15:49 +02:00

imageinfo_ni.h

imageinfo_ni: simplify max_bit handling

2017-03-04 00:37:20 +01:00

imageinfo.cpp

CImageInfo: expand fallback to get readable version string

2017-11-19 20:49:34 +01:00

imageinfo.h

imageinfo: change handling of yWeb version; use own CConfigFile

2017-03-03 15:48:31 +01:00

imdb.cpp

fix build

2017-10-02 23:55:51 +02:00

imdb.h

icons: add rating-stars to icons.h; version 2.0

2017-05-29 16:30:39 +02:00

info_menue.cpp

re-remove unneeded ifdefs

2017-11-11 08:59:04 +01:00

info_menue.h

…

infoclock.cpp

move ENABLE_CHANGE_OSD_RESOLUTION to scale2Res() function

2017-02-19 23:31:46 +01:00

infoclock.h

…

infoicons_setup.cpp

several memleak fixes; Dziekuje.

2017-09-28 15:23:38 +02:00

infoicons_setup.h

…

infoicons.cpp

…

infoicons.h

…

infoviewer_bb.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

infoviewer_bb.h

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-02-28 15:36:23 +01:00

infoviewer.cpp

infoviewer: rework radiotext element; ...

2017-11-27 23:18:14 +01:00

infoviewer.h

infoviewer: rework radiotext element; ...

2017-11-27 23:18:14 +01:00

keybind_setup.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-10-18 09:41:46 +02:00

keybind_setup.h

…

lcd4l_setup.cpp

channelist: fix lcd4l-handling; ...

2017-10-07 10:50:52 +02:00

lcd4l_setup.h

…

lcd4l.cpp

lcd4l: add info1 and info2; ...

2017-07-31 17:14:10 +02:00

lcd4l.h

lcd4l: add info1 and info2; ...

2017-07-31 17:14:10 +02:00

Makefile.am

re-add working streaminfo for coolstream hardware; ...

2017-11-16 19:43:26 +01:00

mediaplayer_setup.cpp

clearify headers for ausioplayer/internetradio setup

2017-08-17 21:49:43 +02:00

mediaplayer_setup.h

…

mediaplayer.cpp

mediaplayer: disable fileplayback audio for coolstream; that doesn't work

2017-11-25 09:58:55 +01:00

mediaplayer.h

rework multimedia-menu code; cleanup from many unused code

2017-09-13 15:52:19 +02:00

miscsettings_menu.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-10-18 09:41:46 +02:00

miscsettings_menu.h

miscsettings_menu: add new submenu for plugins

2017-09-12 22:30:35 +02:00

motorcontrol.cpp

add comments to suppres -Wimplicit-fallthrough warnings

2017-09-26 12:41:05 +02:00

motorcontrol.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

movieplayer.cpp

screensaver: move more repeatedly used code to screensaver's code

2017-11-25 09:58:55 +01:00

movieplayer.h

movieplayer: use members from screensaver's code

2017-11-25 09:58:55 +01:00

netfs_setup.cpp

fix build

2017-10-02 23:55:51 +02:00

netfs_setup.h

netfs_setup: drop unused LUFS support

2017-09-12 22:30:35 +02:00

network_service.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-09-23 17:01:42 +02:00

network_service.h

…

network_setup.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-11-02 23:25:41 +01:00

network_setup.h

…

nfs.cpp

…

nfs.h

…

opkg_manager.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-08-26 12:58:44 +02:00

opkg_manager.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

osd_helpers.cpp

fix select osd resolution

2017-10-29 18:31:45 +01:00

osd_helpers.h

Revert "- allow to force given osd resolution in "videosystem = auto" mode"

2017-03-12 06:32:52 +01:00

osd_progressbar_setup.cpp

remove graphic progressbar

2017-06-06 00:09:31 +02:00

osd_progressbar_setup.h

…

osd_setup.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

osd_setup.h

Revert "src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken"

2017-09-26 12:41:05 +02:00

osdlang_setup.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-03-04 19:32:30 +01:00

osdlang_setup.h

…

parentallock_setup.cpp

parentallock_setup: fix compiler warning; remove easymenu leftover

2017-09-13 18:44:29 +02:00

parentallock_setup.h

…

personalize.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-10-18 09:41:46 +02:00

personalize.h

rename g_PluginList to g_Plugins; this isn't a list of plugins

2017-03-01 13:03:50 +01:00

pictureviewer_help.h

…

pictureviewer_setup.cpp

…

pictureviewer_setup.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

pictureviewer.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

pictureviewer.h

pictureviewer: small design reworks ...

2017-06-15 01:01:55 +02:00

pipsetup.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

pipsetup.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

pluginlist.cpp

plugin-code: cleanup from many unused code; ...

2017-09-14 12:14:41 +02:00

pluginlist.h

plugin-code: cleanup from many unused code; ...

2017-09-14 12:14:41 +02:00

plugins_hide.cpp

fix build

2017-10-02 23:55:51 +02:00

plugins_hide.h

…

plugins.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-09-23 17:01:42 +02:00

plugins.h

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

2017-11-28 10:31:10 +01:00

proxyserver_setup.cpp

…

proxyserver_setup.h

…

rc_lock.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-09-23 17:01:42 +02:00

rc_lock.h

…

record_setup.cpp

drop easymenu

2017-09-13 13:35:23 +02:00

record_setup.h

…

scan_setup.cpp

add DVB-T2 support, enable 5V supply

2017-11-27 10:22:52 +01:00

scan_setup.h

add DVB-T2 support, enable 5V supply

2017-11-27 10:22:52 +01:00

scan.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-08-26 12:58:44 +02:00

scan.h

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-09 13:19:03 +01:00

screensaver.cpp

screensaver: move more repeatedly used code to screensaver's code

2017-11-25 09:58:55 +01:00

screensaver.h

screensaver: move more repeatedly used code to screensaver's code

2017-11-25 09:58:55 +01:00

screensetup.cpp

rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

2017-09-29 10:34:23 +02:00

screensetup.h

replace framebuffer.h include with forward declaration

2017-02-07 17:23:42 +01:00

settings_manager_teams.cpp

settings_manager_teams: small reworks; unify locales

2017-09-09 11:03:52 +02:00

settings_manager_teams.h

settings_manager_teams: small reworks; unify locales

2017-09-09 11:03:52 +02:00

settings_manager.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-10-18 09:41:46 +02:00

settings_manager.h

…

sleeptimer.cpp

…

sleeptimer.h

…

start_wizard.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-10-18 09:41:46 +02:00

start_wizard.h

…

streaminfo1.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

streaminfo1.h

re-add working streaminfo for coolstream hardware; ...

2017-11-16 19:43:26 +01:00

streaminfo2.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

streaminfo2.h

streaminfo: minor re-formatations and whitespace cleanups

2017-11-16 19:43:26 +01:00

subchannel_select.cpp

subchannel_select: ensure buffer does not overflow

2017-09-26 12:41:05 +02:00

subchannel_select.h

…

test_menu.cpp

CTestMenu: add gui restart item for faster access

2017-11-19 20:49:37 +01:00

test_menu.h

…

themes.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-10-18 09:41:46 +02:00

themes.h

…

timeosd.cpp

neutrino: move screensaver members to screensaver's code

2017-11-25 09:58:55 +01:00

timeosd.h

…

timerlist.cpp

timerlist: don't cast saved_displaymode

2017-11-16 20:39:34 +01:00

timerlist.h

timerlist: don't cast saved_displaymode

2017-11-16 20:39:34 +01:00

tmdb.cpp

remove "using namespace std" from header files

2017-10-02 13:43:57 +02:00

tmdb.h

…

update_check.cpp

update-check: move init of object CFlashUpdate out of while-loop

2017-09-04 23:24:22 +02:00

update_check.h

update-check: move init of object CFlashUpdate out of while-loop

2017-09-04 23:24:22 +02:00

update_ext.cpp

remove "using namespace std" from header files

2017-10-02 13:43:57 +02:00

update_ext.h

…

update_menue.cpp

update_menue: hide expert functions for ARM_HARDWARE

2017-10-29 21:38:46 +01:00

update_menue.h

…

update_settings.cpp

Merge remote-tracking branch 'tuxbox/master'

2017-09-23 17:01:42 +02:00

update_settings.h

…

update.cpp

update: fix display of installed version; ...

2017-11-16 19:43:26 +01:00

update.h

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-10-18 09:41:46 +02:00

upnpbrowser.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

upnpbrowser.h

fix video folderplay

2017-10-08 16:49:23 +02:00

user_menue_setup.cpp

allow to play audiofiles with multiformat player; split into video and audio

2017-10-28 19:13:45 +02:00

user_menue_setup.h

…

user_menue.cpp

usermenu: cleanup from ITEM_RASS

2017-11-27 23:24:55 +01:00

user_menue.h

…

vfd_setup.cpp

vfd-setup: allow to set scroll_repeats if possible

2017-11-16 20:39:34 +01:00

vfd_setup.h

…

videosettings.cpp

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

2017-11-28 10:31:10 +01:00

videosettings.h

videosettings: select VIDEOMENU_43MODE_OPTIONS at runtime

2017-03-04 20:36:56 +01:00

volumebar.cpp

neutrino: unify modes handling; ...

2017-11-22 15:42:09 +01:00

volumebar.h

…

webtv_setup.cpp

webtv-setup: clearify hint for autoload item

2017-11-25 09:58:55 +01:00

webtv_setup.h

…

zapit_setup.cpp

unify headers in miscsetting's submenus

2017-09-12 22:30:35 +02:00

zapit_setup.h

…