mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,894 Commits 2 Branches 9 Tags
bb4564e909632ca38dbf49e7c13365b1840fa75f
Commit Graph

126 Commits

Author SHA1 Message Date
vanhofen
bb4564e909 videosettings/psisetup; re-add (deactivated) small psi menu 
Origin commit data
------------------
Commit: 6b496f5e14
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-07-27 (Mon, 27 Jul 2020)

Origin message was:
------------------
- videosettings/psisetup; re-add (deactivated) small psi menu
 2020-07-27 23:16:44 +02:00
vanhofen
9c3c366571 pick psisetup from https://github.com/maxwiesel/neutrino-max 
Origin commit data
------------------
Commit: b79c37da51
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-07-27 (Mon, 27 Jul 2020)

Origin message was:
------------------
- pick psisetup from https://github.com/maxwiesel/neutrino-max
 2020-07-27 23:16:44 +02:00
Markus Volk
f8d1b0114a align enabled_videomodes preset 
Origin commit data
------------------
Commit: 7737d48599
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-03-24 (Tue, 24 Mar 2020)
 2020-03-24 22:25:05 +01:00
Markus Volk
1f6e71c2d6 videosettings: cleanup 
Signed-off-by: Markus Volk <f_l_k@t-online.de>


Origin commit data
------------------
Commit: 67c348d4cc
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-03-24 (Tue, 24 Mar 2020)
 2020-03-24 22:25:05 +01:00
Markus Volk
0d147b7b54 supplement to f9f1ceda4f37e797be7b839eadabe83c8daef9b2 
Origin commit data
------------------
Commit: b8a7188576
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-03-24 (Tue, 24 Mar 2020)
 2020-03-24 22:25:05 +01:00
Markus Volk
003e635c8c add 1080p60 resolution for edision osmio stb 
Origin commit data
------------------
Commit: 06da497f4d
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-03-24 (Tue, 24 Mar 2020)
 2020-03-24 22:25:05 +01:00
vanhofen
a7e844e809 fix build; broken since 86c2ae2 
Origin commit data
------------------
Commit: 37bf3ee0e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-03-06 (Fri, 06 Mar 2020)

Origin message was:
------------------
- fix build; broken since 86c2ae2
 2020-03-06 22:19:21 +01:00
Markus Volk
3ca1077c9c fix typo 
Origin commit data
------------------
Commit: d359913543
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-03-05 (Thu, 05 Mar 2020)
 2020-03-05 22:31:04 +01:00
Markus Volk
86c2ae2f62 videosettings.cpp: hide zapmode settings for boxes that dont have it (e.g. osmio) 
Origin commit data
------------------
Commit: 930366584e
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-03-05 (Thu, 05 Mar 2020)
 2020-03-05 22:30:54 +01:00
vanhofen
837ff992f0 videosettings: add menu hint to zappingmode item 
Origin commit data
------------------
Commit: 201550de4d
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-26 (Sun, 26 Jan 2020)

Origin message was:
------------------
- videosettings: add menu hint to zappingmode item
 2020-01-26 22:31:45 +01:00
vanhofen
79fa20a18a videosettings: reduce videomenu.zappingmode to mute and hold 
Origin commit data
------------------
Commit: 424c335947
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-26 (Sun, 26 Jan 2020)

Origin message was:
------------------
- videosettings: reduce videomenu.zappingmode to mute and hold
 2020-01-26 22:31:45 +01:00
BPanther
5507040494 arm/mips: new video setting zapping mode added 
Origin commit data
------------------
Commit: 84fbb0c6c6
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-26 (Sun, 26 Jan 2020)
 2020-01-26 22:31:45 +01:00
vanhofen
6622c995a9 move compatibility headers to /lib/hardware 
Origin commit data
------------------
Commit: 651a56aab8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-21 (Fri, 21 Dec 2018)

Origin message was:
------------------
- move compatibility headers to /lib/hardware
 2018-12-21 22:30:34 +01:00
GetAway
f5dd34119e videosettings.cpp: use hw_caps->has_button_vformat 
Origin commit data
------------------
Commit: cf07ebb3b1
Author: GetAway <get-away@t-online.de>
Date: 2018-12-01 (Sat, 01 Dec 2018)
 2018-12-01 18:03:25 +01:00
Thilo Graf
d079dc3b10 src/gui/videosettings.cpp: don't show entry for vf key settings 
Available on CS hardware

TODO: make configurable for other keys on other hardware


Origin commit data
------------------
Commit: 8f32d42868
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-29 (Sun, 29 Apr 2018)
 2018-04-29 03:13:07 +02:00
GetAway
fab27d0c19 videosettings: fix set and get video_43mode 
Origin commit data
------------------
Commit: 5e65dca8c3
Author: GetAway <get-away@t-online.de>
Date: 2018-04-22 (Sun, 22 Apr 2018)
 2018-04-22 22:24:18 +02:00
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
vanhofen
5a4a60e979 Revert "adding 4k video settings for armbox" 
This reverts commit 2e19a1eb69.
Was applied two times by mistake.


Origin commit data
------------------
Commit: a95badc394
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
 2017-10-05 13:26:10 +02:00
TangoCash
2e19a1eb69 adding 4k video settings for armbox 
Origin commit data
------------------
Commit: 3d11c2a1e5
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
 2017-10-05 12:52:53 +02:00
TangoCash
b575ff847f adding 4k video settings for armbox 
Origin commit data
------------------
Commit: 3b2bb3f3ca
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
 2017-10-05 12:52:53 +02:00
vanhofen
3b0222d2d5 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:41:44 +02:00
Stefan Seyfried
25e3075876 Merge remote-tracking branch 'tuxbox/master' 
needs buildfixes


Origin commit data
------------------
Commit: 514cb3ed1e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-23 17:01:42 +02:00
vanhofen
16f0d0ca8a code alignments to master branch 
Origin commit data
------------------
Commit: dbb726e191
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)

Origin message was:
------------------
- code alignments to master branch
 2017-09-21 11:41:59 +02:00
vanhofen
b6f0973650 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 6cfea8c955
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)
 2017-09-21 10:36:43 +02:00
Jacek Jendrzej
c44f82f12a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 13:40:40 +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
487fa232a3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 08:36:25 +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
Stefan Seyfried
5db1afe258 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
 2017-08-26 12:58:44 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 16:20:47 +02:00
Michael Liebmann
a5ea4fd29e src/gui/videosettings.cpp: Replace BOXMODEL_APOLLO by BOXMODEL_CS_HD2 
Origin commit data
------------------
Commit: bfcf4057d5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 00:13:35 +01:00
vanhofen
673144da8e Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: dfac4d01dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:43:51 +01:00
vanhofen
47b8bce563 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: e24708f93c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 20:44:04 +01:00
Michael Liebmann
899a89d694 COsdHelpers: Remove no longer required function resetOsdResolution() 
Origin commit data
------------------
Commit: b1dcce0ad3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 19:54:09 +01:00
Michael Liebmann
270d7c4cd6 COsdHelpers: Add function setVideoSystem() 
Origin commit data
------------------
Commit: fa08347ef4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 19:54:09 +01:00
Stefan Seyfried
8905ab3eb1 videosettings: select VIDEOMENU_43MODE_OPTIONS at runtime 
instead of hard coded hardware dependence, select panscan and display
AR options at run time via hw_caps.


Origin commit data
------------------
Commit: c2f7e1b1c0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 20:36:56 +01:00
Stefan Seyfried
b93f4e419a Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 19:32:30 +01:00
vanhofen
68e2832f96 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 16:55:39 +01:00
Michael Liebmann
84759d6c05 osd resolution: Use COsdHelpers::changeOsdResolution() to adjust... 
...OSD resolution after switching video format


Origin commit data
------------------
Commit: ff11dd44ab
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:04:09 +01:00
vanhofen
698e9a92cd Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: b5dd90e3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
 2017-02-25 00:17:33 +01:00
Thilo Graf
856c7071e8 CVideoSettings: avoid unnecessary display of messageboxes 
Origin commit data
------------------
Commit: be9dd7938d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-24 (Fri, 24 Feb 2017)
 2017-02-25 00:02:52 +01:00
vanhofen
5b0a65a16d more rename hardware defined macros for coolstream stb 
Origin commit data
------------------
Commit: 5962554382
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- more rename hardware defined macros for coolstream stb
 2017-02-12 22:21:18 +01:00
vanhofen
ba302de46b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:17:17 +01:00
Stefan Seyfried
c4cc5e62bb Merge remote-tracking branch 'tuxbox/pu/fb-modules' 
only compile tested ;-)


Origin commit data
------------------
Commit: 2819e651c3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:29:10 +01:00
Michael Liebmann
7e9107c8a8 neutrino: Rename hardware defined macros for coolstream stb 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
 2017-02-12 09:21:04 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:02:51 +01:00
vanhofen
65e0a39980 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
 2016-11-21 12:46:49 +01:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-10-24 10:31:24 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00