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
12,590 Commits 2 Branches 9 Tags
cca109a84b99c9b3285b1188196fe0d5aa9eeece
Commit Graph

1257 Commits

Author SHA1 Message Date
vanhofen
b72b12a375 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/neutrino.cpp


Origin commit data
------------------
Commit: 134e499be0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 08:33:33 +01:00
vanhofen
8ea61f3383 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: 14473245e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 08:29:51 +01:00
Michael Liebmann
3d81065d4f Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 9209326a1b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 06:25:45 +01:00
Stefan Seyfried
b70dc32362 rcinput: remove unused/unimplemented click functions 
Origin commit data
------------------
Commit: f45456d7a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-22 06:24:48 +01:00
Michael Liebmann
31c041a325 Fix compiler format warnings 
Origin commit data
------------------
Commit: e35969afe2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 06:24:48 +01:00
vanhofen
59b2a3b072 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: f5ef33794a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 15:14:59 +01:00
vanhofen
25f833735d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 15:14:31 +01:00
Michael Liebmann
a26c4afdd5 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: eb0d7afa95
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 06:39:24 +01:00
Stefan Seyfried
8c63d840c5 libtuxtxt: remove unused fd parameter from tuxtx_main() 
Origin commit data
------------------
Commit: 418819e261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
1ed17f5a89 rcinput: remove unused/unimplemented click functions 
Origin commit data
------------------
Commit: 9b8524b37b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 20:36:45 +01:00
Stefan Seyfried
71f351bdfe libtuxtxt: remove unused fd parameter from tuxtx_main() 
Origin commit data
------------------
Commit: eb3fa7f2af
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 11:52:37 +01:00
vanhofen
25046a4627 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/screenshot.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 22:54:00 +01:00
vanhofen
298fdbfe36 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 21:52:59 +01:00
vanhofen
ee64adc00b neutrino: small code cosmetics in loadSetup() 
Origin commit data
------------------
Commit: d457cc8ef5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)

Origin message was:
------------------
- neutrino: small code cosmetics in loadSetup()
 2017-02-15 08:48:38 +01:00
vanhofen
6467636232 disable strange try-to-detect-bad-config-file if-statement 
Origin commit data
------------------
Commit: 56b99e0b47
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)

Origin message was:
------------------
- disable strange try-to-detect-bad-config-file if-statement
 2017-02-15 08:48:38 +01:00
vanhofen
ca916b849c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/fb_generic.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 8a4a5e1ae6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 23:29:07 +01:00
vanhofen
1a0368da1e align new osd-presets to good old NI-values 
Origin commit data
------------------
Commit: af88313946
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- align new osd-presets to good old NI-values
 2017-02-13 23:19:58 +01:00
vanhofen
89ecafc611 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 49b9be599b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 23:16:26 +01:00
vanhofen
89d74444cf set new osd-presets closer to old values; auto-calc screenEnd-values 
Origin commit data
------------------
Commit: 145c0d41b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- set new osd-presets closer to old values; auto-calc screenEnd-values
 2017-02-13 22:50:48 +01:00
vanhofen
913fcbeb07 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5506a6c290
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 21:41:11 +01:00
vanhofen
8704cb914a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 21:41:04 +01:00
vanhofen
66861f155d fix keywords in strange try-to-detect-bad-config-file if-statement 
Origin commit data
------------------
Commit: 6964b62c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- fix keywords in strange try-to-detect-bad-config-file if-statement
 2017-02-13 21:34:01 +01:00
vanhofen
789fdb6d86 migrate users settings; screen_StartX_crt/lcd -> screen_StartX_crt/lcd_0 
Origin commit data
------------------
Commit: 9792b47666
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
- migrate users settings; screen_StartX_crt/lcd -> screen_StartX_crt/lcd_0
 2017-02-13 21:21:11 +01:00
Michael Liebmann
0c20bf9af6 neutrino: Add switch osd resolution when supported from hardware 
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


Origin commit data
------------------
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)
 2017-02-13 12:51:14 +01:00
Michael Liebmann
c9958d4e6b CFbAccelCSHD2::setMode: Update for new framebuffer driver (full hd) 
Origin commit data
------------------
Commit: 33125aed06
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
 2017-02-13 12:51:14 +01:00
vanhofen
bad03fe56c Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/fb_accel.h
	src/driver/fb_accel_glfb.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/gui/bookmarkmanager.cpp
	src/gui/epgview.h
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/gui/widget/buttons.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 8f312e1d00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:50:14 +01:00
vanhofen
6057caae9a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:04:09 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:01:15 +01:00
Stefan Seyfried
948f29ed4d neutrino: move start of standby epgscan forward 
this avoids that cpufreq is set to standby value before epgscan is
started, resulting in poor performance


Origin commit data
------------------
Commit: 7384e2155e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:57:52 +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
vanhofen
e97d93f824 NI-code: Rename hardware defined macros for coolstream stb 
Origin commit data
------------------
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb
 2017-02-12 21:57:06 +01:00
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:54:48 +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
Stefan Seyfried
4de0a4332e neutrino: move start of standby epgscan forward 
this avoids that cpufreq is set to standby value before epgscan is
started, resulting in poor performance


Origin commit data
------------------
Commit: 4f23baae1e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 15:19:51 +01:00
Michael Liebmann
3b018febe6 Merge branch 'master' into pu/fb-modules 
Origin commit data
------------------
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 09:24:08 +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
706a5ba010 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
 2017-02-11 11:18:45 +01:00
vanhofen
227480877c Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4f68a5502b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
 2017-02-10 00:44:57 +01:00
vanhofen
bc099cfd08 neutrino: fix build 
Origin commit data
------------------
Commit: eef7c4c867
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)

Origin message was:
------------------
- neutrino: fix build
 2017-02-09 20:58:44 +01:00
vanhofen
4d15c4d61b Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 20:22:37 +01:00
vanhofen
e994f66c6f avoid configuration mismatch in screen settings 
Origin commit data
------------------
Commit: ad8e6180aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)

Origin message was:
------------------
- avoid configuration mismatch in screen settings
 2017-02-09 18:13:19 +01:00
vanhofen
252208b058 remove screen_width/height from neutrino.conf; ... 
it's just for internal usage


Origin commit data
------------------
Commit: abb76c2efb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-12 (Thu, 12 Jan 2017)

Origin message was:
------------------
- remove screen_width/height from neutrino.conf; ...

it's just for internal usage
 2017-02-09 18:13:19 +01:00
vanhofen
54af49f2d0 rename screen_x/yres to font_scaling_x/y 
Origin commit data
------------------
Commit: aeec37af89
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-12 (Thu, 12 Jan 2017)

Origin message was:
------------------
- rename screen_x/yres to font_scaling_x/y
 2017-02-09 18:13:19 +01:00
vanhofen
c4de218cb2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 13:19:03 +01:00
vanhofen
49762424a6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 221e4b5c04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 08:35:14 +01:00
GetAway
21345ecf59 make the webtv directory configurable 
Origin commit data
------------------
Commit: a62d5b7c8e
Author: GetAway <get-away@t-online.de>
Date: 2017-02-07 (Tue, 07 Feb 2017)
 2017-02-09 08:22:43 +01:00
Stefan Seyfried
d609f51abf neutrino: initialize api before setting up framebuffer 
Origin commit data
------------------
Commit: 7504fe264e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-05 22:55:00 +01:00
Stefan Seyfried
40d45e44a3 add --enable-fastscan configure option 
The #define in src/gui/scan_setup.h did not work (undefining
ENABLE_FASTSCAN caused really strange side effects wrt background
scanning in standby mode), and all the unused code was still built.
With this configure option, people who really want this obscure feature
can enable it for their builds.


Origin commit data
------------------
Commit: 6525d1164a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-04 (Sat, 04 Feb 2017)
 2017-02-04 12:09:47 +01:00
vanhofen
fccd63624c Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/framebuffer_ng.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: dd0237039d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 13:12:54 +01:00
vanhofen
59d037e5ea Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 43ef78ee44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 13:10:10 +01:00