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

1482 Commits

Author SHA1 Message Date
vanhofen
b508879516 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 91fbed7586
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 00:07:20 +01:00
vanhofen
f7bffbff09 Revert "- fix segfault at startup" 
This reverts commit b6164c20b7.


Origin commit data
------------------
Commit: 8bd88c94af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 00:07:10 +01:00
Michael Liebmann
3a8adb94f0 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 6c3b5dcd93
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
 2017-03-02 23:38:19 +01:00
Michael Liebmann
0cdafc7a1e CNeutrinoApp::loadSetup: Fix Segfault when an remote timer is defined 
Origin commit data
------------------
Commit: 9fe20399c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
 2017-03-02 23:37:41 +01:00
vanhofen
b6164c20b7 fix segfault at startup 
Origin commit data
------------------
Commit: 0e2a405fa5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-02 (Thu, 02 Mar 2017)

Origin message was:
------------------
- fix segfault at startup
 2017-03-02 22:23:32 +01:00
vanhofen
e714a2ae52 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 18:18:07 +01:00
Jacek Jendrzej
7c0dde29d3 src/neutrino.cpp init struct timer_remotebox_item, avoid segfault without InfoClock 
Origin commit data
------------------
Commit: d12ea80c5b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 15:04:10 +01:00
vanhofen
a360c99a70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:10:36 +01:00
vanhofen
260127f781 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:09:50 +01:00
vanhofen
a9edf315db rename g_PluginList to g_Plugins; this isn't a list of plugins 
Origin commit data
------------------
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins
 2017-03-01 13:03:50 +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
vanhofen
f5d9d25957 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:36:23 +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
4f4c656b55 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/driver/rcinput.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 33441c2ba2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
 2017-02-26 00:45:36 +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
vanhofen
eff3409675 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 33525aeafd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
 2017-02-25 00:15:45 +01:00
Michael Liebmann
fd900851ad Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 2174dde26b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-24 (Fri, 24 Feb 2017)
 2017-02-24 18:55:15 +01:00
Michael Liebmann
6bd7813c83 neutrino: No terminate moviebrowser, menue, etc. when recording start 
Origin commit data
------------------
Commit: 0953e66d22
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)
 2017-02-24 18:54:53 +01:00
vanhofen
a725775c2b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4c3d44ab64
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-24 (Fri, 24 Feb 2017)
 2017-02-24 17:23:04 +01:00
Stefan Seyfried
9bddb838e0 rcinput/neutrino: avoid the use of EVT_TIMESET 
sectionsd's EVT_TIMESET was only used to fix time calculations
for input repeat detection. I doubt this reliably worked anyway.
Just calculate an absolute input timestamp from CLOCK_MONOTONIC
and use that. Even better solution would be to use a newer
kernel with EVIOCSCLOCKID ioctl, leave that for later :-)


Origin commit data
------------------
Commit: d2408d1ade
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2017-02-24 15:53:44 +01:00
Michael Liebmann
f74245d8ab Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 1dccb68ad1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)
 2017-02-23 15:14:54 +01:00
vanhofen
0a6086c182 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 6d05bd5d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
 2017-02-23 12:23:43 +01:00
vanhofen
40df044204 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: de1be9b239
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
 2017-02-23 12:22:30 +01:00
vanhofen
daf29c0d9c neutrino.cpp: fix compiler warning; ... 
msg and data is type long unsigned int, so %lu seems the right format,
but above %lX is used too and it works fine. So, what's the right one?


Origin commit data
------------------
Commit: c4aaf7678c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)

Origin message was:
------------------
- neutrino.cpp: fix compiler warning; ...

msg and data is type long unsigned int, so %lu seems the right format,
but above %lX is used too and it works fine. So, what's the right one?
 2017-02-23 12:17:30 +01:00
Stefan Seyfried
9960939337 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 08:44:53 +01:00
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