Commit Graph

42 Commits

Author SHA1 Message Date
vanhofen
2e5ce4bf28 Revert "- audio_select: copy full code from TangoCash"
This reverts commit 18bbbbabfe.

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/audio_select.cpp
	src/system/setting_helpers.cpp
	src/system/setting_helpers.h


Origin commit data
------------------
Commit: 2cd2a8599c
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)
2018-01-03 11:55:54 +01:00
vanhofen
c8da6fe89f cleanup from unsupported DUCKBOX_HARDWARE
Origin commit data
------------------
Commit: bc0de58721
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-08 (Wed, 08 Nov 2017)

Origin message was:
------------------
- cleanup from unsupported DUCKBOX_HARDWARE
2017-11-08 09:28:34 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
2017-11-03 09:36:19 +01:00
vanhofen
dbc81968f9 fix another merge error
Origin commit data
------------------
Commit: 59a9cc5dff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error
2017-11-03 08:45:06 +01:00
vanhofen
d99f701c0b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/driver/screenshot.cpp
	src/driver/screenshot.h
	src/driver/simple_display.cpp
	src/driver/vfd.cpp
	src/gui/audio_select.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/zapit/include/zapit/capmt.h
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
2017-11-03 00:09:05 +01:00
vanhofen
284138fbc5 audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5fd7ec68ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-10-29 18:32:30 +01:00
vanhofen
18bbbbabfe audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.


Origin commit data
------------------
Commit: e264e6334b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.
2017-10-12 08:52:32 +02:00
vanhofen
9db42a7d2b drop easymenu
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
2017-09-13 13:35:23 +02:00
vanhofen
ff21981795 drop easymenu
Origin commit data
------------------
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
2017-09-12 23:46:22 +02:00
Jacek Jendrzej
b06b3db436 some compil warning fixes
Origin commit data
------------------
Commit: 8638cd73b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-22 (Fri, 22 Apr 2016)
2016-04-22 16:46:21 +02:00
[CST] Focus
54e2034f30 neutrino: use background MP instance in webtv mode
Origin commit data
------------------
Commit: 75ae46a216
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-16 (Fri, 16 Oct 2015)
2015-10-16 14:55:06 +03: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
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
martii
69f917f16d drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
2014-09-15 11:44:08 +04:00
[CST] Focus
8f7f3f9e4d webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
2014-08-27 17:32:26 +04:00
[CST] Focus
87635c97f5 gui/audio_select.cpp: disable analog audio on/off for easy menu mode
Origin commit data
------------------
Commit: 8bd433aee0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-31 (Mon, 31 Mar 2014)
2014-04-02 17:32:30 +04:00
Michael Liebmann
b6b44d9088 Preparing the menu classes for Lua Part #3
- Add non locale variants for CMenuOptionNumberChooser and
 CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
 THX Martii


Origin commit data
------------------
Commit: afbd87083b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #3

- Add non locale variants for CMenuOptionNumberChooser and
 CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
 THX Martii
2014-01-19 20:57:37 +01:00
Michael Liebmann
1918153c0a Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii
2014-01-19 20:57:37 +01:00
[CST] Focus
4a001b5bfd gui/audio_select.cpp: add stop icon to stop subtitles item
Origin commit data
------------------
Commit: a6d7577235
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 16:32:39 +04: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
[CST] Focus
00d7b9fa4a gui/audio_select.cpp: add PID volume adjusting
Origin commit data
------------------
Commit: b8f78e9c5d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
2012-08-16 15:55:59 +04:00
Thilo Graf
07554a0dcc neutrino: port personalize feature from tuxbox
This is a partial port of original neutrino personalize feature
and includes also moving of user menu settings from key setup into this setup,
but it's not completley yet in some details and so I think it's a lot to do.
I hope it works fine and the many user requests are justifying this feature.

TODO:
- doc into wiki
- adapt for yWeb
- some reworks for user menu settings and plugin management
- add timer and rework tv radio mode switch item(s)
and many more...

please report: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2010 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: aaa988db5f
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-12-28 (Wed, 28 Dec 2011)

Origin message was:
------------------
*neutrino: port personalize feature from tuxbox

This is a partial port of original neutrino personalize feature
and includes also moving of user menu settings from key setup into this setup,
but it's not completley yet in some details and so I think it's a lot to do.
I hope it works fine and the many user requests are justifying this feature.

TODO:
- doc into wiki
- adapt for yWeb
- some reworks for user menu settings and plugin management
- add timer and rework tv radio mode switch item(s)
and many more...

please report: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2010 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-12-28 00:19:15 +00:00
[CST] Focus
6450c335d0 Add audio pid set code; Return menu result
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1912 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: ccb5c4d8d3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-26 (Sat, 26 Nov 2011)
2011-11-26 10:25:45 +00:00
gixxpunk
1a6e611839 audio-select testfix -> http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p130017-bug-audio-optionen/#post130017
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1466 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 4292dac8a6
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-05-12 (Thu, 12 May 2011)

Origin message was:
------------------
- audio-select testfix -> http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p130017-bug-audio-optionen/#post130017

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1466 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-05-12 18:45:34 +00:00
Thilo Graf
3cd8698e08 neutrino port: audioselect menu
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1326 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: e392fa28ad
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-03-23 (Wed, 23 Mar 2011)

Origin message was:
------------------
*neutrino port: audioselect menu

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1326 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-23 10:57:20 +00:00
Jacek Jendrzej
72d0ee526f use snprintf
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@656 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: a82a2410b9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-07-12 (Mon, 12 Jul 2010)

Origin message was:
------------------
-use snprintf

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@656 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-07-12 13:26:38 +00:00
Jacek Jendrzej
7fd91f6af8 fix Buffer size
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@655 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 21592ffbcc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-07-12 (Mon, 12 Jul 2010)

Origin message was:
------------------
-fix Buffer size

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@655 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-07-12 13:12:51 +00:00
[CST] Focus
cffd7c10a6 network menu (#264)
- tune timeout (#266)
- satfinder (#269)
- tuxtxt:
	new monospace font to support more languages
	option to select teletext font
	charset selection from pmt
	more menu languages from tuxbox cvs
	cleanup sutitiles start screen
needs testing.
	


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@486 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: ba1f0ceb83
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-03-15 (Mon, 15 Mar 2010)

Origin message was:
------------------
- network menu (#264)
- tune timeout (#266)
- satfinder (#269)
- tuxtxt:
	new monospace font to support more languages
	option to select teletext font
	charset selection from pmt
	more menu languages from tuxbox cvs
	cleanup sutitiles start screen
needs testing.
	


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@486 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-03-15 20:49:03 +00:00
[CST] Focus
f80875a5d8 Change new line to space until OSD code will suppport newline parsing
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@377 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: fc1ce39168
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-18 (Thu, 18 Feb 2010)
2010-02-18 16:55:53 +00:00
[CST] Focus
11ba34a7b4 Fix for virtual zap; Fix for png icon paint from getSize; TTX national tables from actual tux cvs; Starting to test ttx sub remember/autostart
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@322 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: baa6d3bfdd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-12 (Fri, 12 Feb 2010)
2010-02-12 13:10:06 +00:00
Stefan Seyfried
757a401ebc neutrino: fix numbers in menus without digit-icons
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@301 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: ee4514cad1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-02-07 (Sun, 07 Feb 2010)
2010-02-07 22:20:34 +00:00
Stefan Seyfried
a429c12c59 neutrino: add possibility to specify minimal menu width
A static window width was specified in pixels before, which is
"problematic". Then it was ignored and menus were automatically
sized to their largest menu item.
Due to popular demand, add the possibility to specify a minimal
window width in percent of screen width. If set to 0 (default),
menus will autosize as before.
Main menu is set to 22% screenwidth.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@288 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 18dca0f47d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-02-07 (Sun, 07 Feb 2010)
2010-02-07 12:05:02 +00:00
Jacek Jendrzej
b414b208a7 add digi icons to menus
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@245 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 56536f2709
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-01 (Mon, 01 Feb 2010)

Origin message was:
------------------
 add digi icons to menus

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@245 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-01 16:34:43 +00:00
[CST] Focus
c00db1bcde Analog on/off support
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@244 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 8fe922af32
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-01 (Mon, 01 Feb 2010)
2010-02-01 14:54:07 +00:00
[CST] Focus
2e041bd948 All icon file names moved to icons.h; .raw extension removed from icon names
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@219 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 95130dee5a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-29 (Fri, 29 Jan 2010)
2010-01-29 14:09:57 +00:00
[CST] Focus
1074c54e9a More hacks about subtitles...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@189 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 2444fc5f58
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-20 (Wed, 20 Jan 2010)
2010-01-20 14:10:54 +00:00
[CST] Focus
36510a188c TTX subs menu, not ready yet, just backup of current code
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@184 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: b554e4ef4e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-19 (Tue, 19 Jan 2010)
2010-01-19 11:22:08 +00:00
Stefan Seyfried
f889ea0743 widget/menu.*: add keyval_ext type
instead of adding unneeded default values to all menuchooser options
just to cater for two special cases, add an extra version that does
not need a locale setting but instead takes a char* instead.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@129 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 7dcf8fe14d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2009-12-31 (Thu, 31 Dec 2009)
2009-12-31 09:34:53 +00:00
mws
ca4ad2b435 fix initializers and shadows
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@122 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: e1c39d4ce5
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-29 (Tue, 29 Dec 2009)
2009-12-29 11:44:31 +00:00
mws
c62aa94983 Mark unused vars as comment
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 16:23:09 +00:00
mws
9b7b654a3c comment unused var
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@69 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: aa2bb4965d
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-16 (Wed, 16 Dec 2009)
2009-12-16 15:57:28 +00:00
mrcolor
cb8dd3394d our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
2009-12-08 11:05:11 +00:00