Stefan Seyfried
17880c4125
Merge remote-tracking branch 'uncool/cst-next'
...
This need buildfixes and some functional updates...
Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
vanhofen
7882347718
start_wizard: use a global enum; switch detection from bool to int
...
Origin commit data
------------------
Commit: af90286a30
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-05-15 (Fri, 15 May 2015)
Origin message was:
------------------
- start_wizard: use a global enum; switch detection from bool to int
2015-05-15 03:46:50 +02:00
vanhofen
92960161a9
remove w_max()-calls to define menu-width, because ...
...
w-max() returns a pixel-value, but menus need a percentage-value.
Origin commit data
------------------
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de >
Date: 2015-04-24 (Fri, 24 Apr 2015)
Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.
2015-04-24 09:11:04 +02:00
Stefan Seyfried
d1e2143fd6
Merge remote-tracking branch 'check/cst-next'
...
Conflicts:
src/daemonc/remotecontrol.cpp
src/gui/luainstance.cpp
src/gui/movieplayer.cpp
src/gui/videosettings.cpp
src/neutrino.cpp
src/system/setting_helpers.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-12-28 (Sun, 28 Dec 2014)
2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17
Merge remote-tracking branch 'check/cst-next'
...
needs build- and functional fixes
Conflicts:
configure.ac
data/icons/shutdown.jpg
data/icons/start.jpg
data/locale/deutsch.locale
data/locale/english.locale
lib/libmd5sum/md5.c
src/driver/scanepg.cpp
src/driver/streamts.cpp
src/driver/vfd.cpp
src/driver/vfd.h
src/driver/volume.cpp
src/eitd/dmx.cpp
src/eitd/xmlutil.cpp
src/gui/Makefile.am
src/gui/audiomute.cpp
src/gui/channellist.cpp
src/gui/dboxinfo.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/hdd_menu.cpp
src/gui/infoviewer.cpp
src/gui/infoviewer_bb.cpp
src/gui/infoviewer_bb.h
src/gui/keybind_setup.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/miscsettings_menu.cpp
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/osd_progressbar_setup.cpp
src/gui/osd_progressbar_setup.h
src/gui/osd_setup.cpp
src/gui/osdlang_setup.cpp
src/gui/personalize.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/update_settings.cpp
src/gui/user_menue.cpp
src/gui/user_menue_setup.cpp
src/gui/videosettings.cpp
src/gui/widget/buttons.cpp
src/gui/widget/menue.cpp
src/gui/widget/menue.h
src/gui/widget/progresswindow.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/nhttpd/yhttpd.cpp
src/system/helpers.cpp
src/system/locals.h
src/system/locals_intern.h
src/system/setting_helpers.cpp
src/zapit/lib/zapitclient.cpp
src/zapit/src/fastscan.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/scan.cpp
src/zapit/src/scannit.cpp
src/zapit/src/scanpmt.cpp
src/zapit/src/transponder.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
martii
815dea713e
zapit/audio_setup: add gui option for handling volume adjustment defaults
...
Origin commit data
------------------
Commit: 421da2c0cf
Author: martii <m4rtii@gmx.de >
Date: 2013-06-21 (Fri, 21 Jun 2013)
2014-11-24 11:47:04 +01:00
[CST] Focus
958139cd31
merge neutrino-mp menu/buttons/icons changes, (C) martii
...
Origin commit data
------------------
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:25 +04:00
[CST] Focus
85c169c008
gui/audio_setup.cpp: add option to set static volume on boot
...
Origin commit data
------------------
Commit: 44bfc6f746
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-05-14 (Wed, 14 May 2014)
2014-05-14 19:28:37 +04:00
Stefan Seyfried
ccc691278c
Merge remote-tracking branch 'check/next-cc'
...
Lightly tested only...
Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 22:51:23 +01:00
martii
aaa772ebbe
gui/audio_setup: remove disabled code
...
Origin commit data
------------------
Commit: 5131b0e55f
Author: martii <m4rtii@gmx.de >
Date: 2013-12-22 (Sun, 22 Dec 2013)
2013-12-22 16:36:13 +01:00
Stefan Seyfried
80b809a370
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 16:55:53 +01:00
[CST] Focus
e091a84f2b
as requested, implement 'easy' menu mode for novice users;
...
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch
Origin commit data
------------------
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-25 13:03:26 +04:00
Stefan Seyfried
e6cbfe61bc
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
Conflicts:
acinclude.m4
lib/libdvbsub/Makefile.am
lib/libtriple/Makefile.am
lib/libtuxtxt/Makefile.am
src/Makefile.am
src/create_rcsim_h.sh
src/daemonc/Makefile.am
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/eitd/Makefile.am
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/streaminfo2.h
src/gui/update.cpp
src/gui/widget/Makefile.am
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/rcsim.c
src/system/Makefile.am
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-21 22:58:55 +02:00
[CST] Focus
0672de3cdf
gui/audio_setup.cpp: disable nmgr settings on apollo
...
Origin commit data
------------------
Commit: 12d005d1ea
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-09-17 (Tue, 17 Sep 2013)
2013-09-17 09:58:40 +04:00
Stefan Seyfried
fce4dbbe72
Merge branch 'check/next-cc'
...
it compiles, but is not really tested...
Conflicts:
src/driver/netfile.cpp
src/driver/volume.cpp
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/bedit/bouqueteditor_bouquets.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bookmarkmanager.cpp
src/gui/bouquetlist.cpp
src/gui/eventlist.cpp
src/gui/movieplayer.cpp
src/gui/pictureviewer.cpp
src/gui/scan.cpp
src/gui/test_menu.h
src/gui/timerlist.cpp
src/gui/update.cpp
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/zapit/src/Makefile.am
src/zapit/src/femanager.cpp
Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
[CST] Focus
53ba73f37a
gui/audio_setup.cpp: add 'heavy' srs algo on apollo
...
Origin commit data
------------------
Commit: 34a87975a0
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-05-15 (Wed, 15 May 2013)
2013-05-15 09:29:29 +04:00
Stefan Seyfried
345a8a274d
Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'
...
...needs buildfixing...
Conflicts:
data/icons/shutdown.jpg
data/icons/start.jpg
lib/libtuxtxt/tuxtxt.h
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/framebuffer.cpp
src/driver/record.cpp
src/driver/volume.cpp
src/gui/audio_setup.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/infoviewer.cpp
src/gui/keybind_setup.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/update.cpp
src/gui/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/system/Makefile.am
src/system/configure_network.cpp
src/system/httptool.cpp
src/system/setting_helpers.cpp
src/timerd/timermanager.cpp
src/zapit/include/zapit/frontend_c.h
src/zapit/src/Makefile.am
src/zapit/src/capmt.cpp
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-10-14 (Sun, 14 Oct 2012)
2012-10-14 12:51:07 +02:00
Stefan Seyfried
0e99d7bb9b
neutrino: start to use hardware_caps
...
Use hardware_caps instead of cs_get_revision() and #ifdef HAVE_FOO_HW
to distinguish between different boxtypes.
Origin commit data
------------------
Commit: 04ee2e87f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-09-23 (Sun, 23 Sep 2012)
2012-09-23 21:34:47 +02:00
Jacek Jendrzej
9868a4308b
remove doubles include
...
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
Stefan Seyfried
f8a42bcc53
Merge branch 'uncool/dvbsi++' commit '9578e5da35f'
...
This is the last commit before the "menu hints" started.
Needs buildfixing...
Conflicts:
configure.ac
src/daemonc/remotecontrol.cpp
src/daemonc/remotecontrol.h
src/driver/audiodec/basedec.cpp
src/driver/fb_window.cpp
src/driver/rcinput.cpp
src/driver/volume.cpp
src/global.h
src/gui/channellist.cpp
src/gui/eventlist.cpp
src/gui/infoviewer.cpp
src/gui/keybind_setup.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/plugins.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/videosettings.cpp
src/gui/widget/buttons.cpp
src/neutrino.cpp
src/sectionsd/dmx.cpp
src/sectionsd/dmxapi.cpp
src/sectionsd/sectionsd.cpp
src/system/setting_helpers.cpp
src/zapit/include/zapit/client/zapittypes.h
src/zapit/include/zapit/frontend_c.h
src/zapit/include/zapit/satconfig.h
src/zapit/include/zapit/scan.h
src/zapit/lib/zapitclient.cpp
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/pmt.cpp
src/zapit/src/scan.cpp
src/zapit/src/sdt.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-07-22 (Sun, 22 Jul 2012)
2012-07-23 01:02:29 +02:00
Michael Liebmann
eeba96412a
Menu hints: Update loclale
...
- english.locale sorted
- deutsch.locale sorted and translated some new entries (THX Tomworld)
- locals.h/locals_intern.h rebuild
- Corrected typo in the locale/source
Origin commit data
------------------
Commit: c542cb3360
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2012-07-10 (Tue, 10 Jul 2012)
Origin message was:
------------------
* Menu hints: Update loclale
- english.locale sorted
- deutsch.locale sorted and translated some new entries (THX Tomworld)
- locals.h/locals_intern.h rebuild
- Corrected typo in the locale/source
2012-07-11 23:41:08 +01:00
[CST] Focus
7932c1581e
gui/audio_setup.cpp: add menu hints
...
Origin commit data
------------------
Commit: da1eced3e2
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-07-08 (Sun, 08 Jul 2012)
2012-07-08 21:37:23 +04:00
Stefan Seyfried
deb0bcdbfd
spark: enable dolby via HDMI
...
Note: this will only work if dolby via SPDIF is also enabled.
Origin commit data
------------------
Commit: c32efda8a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-06-08 (Fri, 08 Jun 2012)
2012-06-08 22:36:18 +02:00
[CST] Focus
3c012c6445
gui/audio_setup.cpp: fix notify - no need to repaint menu
...
Origin commit data
------------------
Commit: 30327df948
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-05-31 (Thu, 31 May 2012)
2012-05-31 17:12:02 +04:00
[CST] Focus
af4205e76b
GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return
...
Origin commit data
------------------
Commit: 0319c4faad
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-05-07 (Mon, 07 May 2012)
2012-05-07 15:37:02 +04:00
Stefan Seyfried
516c0f1bb3
neutrino: hide Dolby/HDMI and SRS options on Tripledragon
...
Origin commit data
------------------
Commit: 084cf9d9f9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2010-11-06 (Sat, 06 Nov 2010)
2012-04-17 19:33:44 +02:00
[CST] Focus
03e216429c
audio: change change DD over hdmi options to:
...
off, auto (old ON, if supported by device) and force
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2135 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 84afbc9a66
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-03-02 (Fri, 02 Mar 2012)
2012-03-02 14:39:51 +00:00
[CST] Focus
57c00bfe59
Return menu result, to close all menus
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1874 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 7e7e7e218f
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2011-11-22 (Tue, 22 Nov 2011)
2011-11-22 11:12:29 +00:00
Thilo Graf
9b522f5090
neutrino audio_setup: disable SRS TruVolume Technology items if it is disabled
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1505 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 47bc727b43
Author: Thilo Graf <dbt@novatux.de >
Date: 2011-06-03 (Fri, 03 Jun 2011)
Origin message was:
------------------
*neutrino audio_setup: disable SRS TruVolume Technology items if it is disabled
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1505 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-03 00:14:36 +00:00
gixxpunk
6050ad8357
fix audio setup
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1221 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 885098771a
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2011-02-26 (Sat, 26 Feb 2011)
Origin message was:
------------------
- fix audio setup
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1221 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-26 19:13:48 +00:00
gixxpunk
6a2810247f
set volume step value to a maximum of 25
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1204 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 302ea02767
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2011-02-25 (Fri, 25 Feb 2011)
Origin message was:
------------------
- set volume step value to a maximum of 25
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1204 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-25 16:12:44 +00:00
Jacek Jendrzej
92d37421e2
sort ger,eng locale, locals_intern.h & locals.h create with script. for testing
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1195 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 60ad3168e6
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2011-02-22 (Tue, 22 Feb 2011)
2011-02-22 21:24:45 +00:00
Thilo Graf
9f1e14d625
neutrino: cleanup unused members and includes
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1182 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 026a27a521
Author: Thilo Graf <dbt@novatux.de >
Date: 2011-02-21 (Mon, 21 Feb 2011)
Origin message was:
------------------
*neutrino: cleanup unused members and includes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1182 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-21 09:08:32 +00:00
Thilo Graf
471ca6c361
neutrino audio_setup: moved item 'dd subchannel auto on/off'
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@982 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: c38f0540a6
Author: Thilo Graf <dbt@novatux.de >
Date: 2010-12-30 (Thu, 30 Dec 2010)
Origin message was:
------------------
*neutrino audio_setup: moved item 'dd subchannel auto on/off'
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@982 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-30 22:44:01 +00:00
Thilo Graf
85f3f03afa
neutrino audio_setup: optional wizard mode functionality added
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@981 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 080d122f92
Author: Thilo Graf <dbt@novatux.de >
Date: 2010-12-30 (Thu, 30 Dec 2010)
Origin message was:
------------------
*neutrino audio_setup: optional wizard mode functionality added
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@981 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-30 22:43:57 +00:00
Thilo Graf
439172170f
new files added for audio setup
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@980 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: a38863e28e
Author: Thilo Graf <dbt@novatux.de >
Date: 2010-12-30 (Thu, 30 Dec 2010)
2010-12-30 22:43:54 +00:00