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

10585 Commits

This Branch
This Branch
All Branches
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
9f03ff9485 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 182a5ea735
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 08:30:13 +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
Michael Liebmann
f44cc16dd8 CRCInput::set_rc_hw: Fix device check for cs hd2 
Origin commit data
------------------
Commit: 5cac45ccb8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 06:24:48 +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
Stefan Seyfried
380eb92ef1 rcinput: remove now unused (and broken) getFileHandle() 
Origin commit data
------------------
Commit: dceb6989a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-22 06:24:48 +01:00
Stefan Seyfried
101ca7cc0a keybind_setup: use rcinput->setKeyRepeatDelay() 
Origin commit data
------------------
Commit: 8b8b4ce0e2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-22 06:24:48 +01:00
Stefan Seyfried
bb087750ac rcinput: fix set_rc_hw() after dynamic devices patch 
...this could use some tests... :-)


Origin commit data
------------------
Commit: 41958cc029
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-22 06:24:48 +01:00
Stefan Seyfried
862ced36e4 rcinput: add setKeyRepeatDelay() function 
this allows to get rid of the broken getFileHandle function later


Origin commit data
------------------
Commit: 0df5a8df7f
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
c2e76dcd87 rcinput: Add exception handling for cs hd2 
- Supplement to previous commit


Origin commit data
------------------
Commit: 1b79faff78
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 06:24:48 +01:00
Stefan Seyfried
b6f7b80b2a rcinput: use a dynamic list of input devices 
Instead of the fixed, static list of input devices, scan /dev/input/ for
proper event devices. A "good" input device is one that supports the
EVIOCGBIT ioctl and at least the EV_KEY event type.
This probably needs further fixes, e.g. in repeat rate setting code.


Origin commit data
------------------
Commit: 7b3aa2b181
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 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
Michael Liebmann
1574c4b76f rcinput: Transfer from neutrino-mp for better compatibility 
Origin commit data
------------------
Commit: d932a1a326
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)
 2017-02-22 06:24:48 +01:00
Michael Liebmann
1ea4c44450 src/system/helpers.cpp: Add function readLink() 
Origin commit data
------------------
Commit: 0c182785e2
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
b9ffb5d2cf Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d6f8251b87
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 15:14:43 +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
Michael Liebmann
91c174e733 fb_generic: use more swidth variables in fbCopyArea() 
Origin commit data
------------------
Commit: 8bee8b4c6d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-21 (Tue, 21 Feb 2017)
 2017-02-21 06:38:48 +01:00
Stefan Seyfried
08e4d55f88 tuxtxt: remove dead code, unnecessary header includes 
Origin commit data
------------------
Commit: cdc9935b83
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
5709592f5d tuxtxt: remove old, unused input code 
Origin commit data
------------------
Commit: 291eaa0450
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
ec8a58e2a0 fb_accel_glfb: fix color palette setting 
Origin commit data
------------------
Commit: 9385bd8bd9
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
95d1629a50 tuxtxt: remove old framebuffer device code 
Origin commit data
------------------
Commit: b3a79a3a33
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
b94eb7dd30 tuxtxt: remove unused dmx variable 
Origin commit data
------------------
Commit: dfddc62d0c
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
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
caef43db36 acinclude: move AC_SYS_LARGEFILE after AC_CANONICAL_* 
no idea why, but detection of 64bit largefile flags fails otherwise in
some setups


Origin commit data
------------------
Commit: f94f960e85
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
712cc8f86d fb_generic: use 32bit pointers instead of 8bit 
Origin commit data
------------------
Commit: dd653288d8
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
0f4ed6c34a fb_generic: add swidth variable, "stride in fb_pixel_t units" 
this should allow to use fb_pixel_t pointer arithmetics more often
instead of byte pointers


Origin commit data
------------------
Commit: 7c7d5f08dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-21 06:38:48 +01:00
vanhofen
ec7785f5f3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: b3c5b557d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 12:30:00 +01:00
vanhofen
158e72788b Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d09f03acd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 12:29:39 +01:00
vanhofen
321a2f470f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/driver/fb_accel.h
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 58b3f87cf5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 12:29:23 +01:00
Michael Liebmann
2821cf8d16 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: d76c9c536c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-20 (Mon, 20 Feb 2017)
 2017-02-20 00:11:48 +01:00
Michael Liebmann
8cad1eb1a8 tuxtxt: Use hw blitting with fbCopyArea() for cs hd2 
Origin commit data
------------------
Commit: b7110faaf6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-20 00:09:46 +01:00
Michael Liebmann
6fa6152445 framebuffer: Add fbCopyArea function 
- Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
 without hardware acceleration


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

Origin message was:
------------------
framebuffer: Add fbCopyArea function

 - Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
  without hardware acceleration
 2017-02-20 00:09:46 +01:00
vanhofen
b80aa72e71 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d894829c43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 23:35:31 +01:00
vanhofen
557cbe021f Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: aac7acd827
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 23:34:53 +01:00
vanhofen
0d149b95b1 move ENABLE_CHANGE_OSD_RESOLUTION to scale2Res() function 
Origin commit data
------------------
Commit: 43dbfed1ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
- move ENABLE_CHANGE_OSD_RESOLUTION to scale2Res() function
 2017-02-19 23:31:46 +01:00
vanhofen
507153a053 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: db9e856c38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
 2017-02-19 23:22:48 +01:00
vanhofen
a76a894de6 settings.h: scale RADIUS- and OFFSET-defines 
Origin commit data
------------------
Commit: 726302f945
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
- settings.h: scale RADIUS- and OFFSET-defines
 2017-02-19 23:22:12 +01:00
vanhofen
0f93a1d522 framebuffer: rename scaleFont() to scale2Res() 
Origin commit data
------------------
Commit: e631c3e3c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
- framebuffer: rename scaleFont() to scale2Res()
 2017-02-19 23:22:12 +01:00
vanhofen
0370fca8b5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: c28991d0fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-17 (Fri, 17 Feb 2017)
 2017-02-17 17:44:29 +01:00
Jacek Jendrzej
fdf8abc174 try to fix segfault with --enable-cleanup 
Origin commit data
------------------
Commit: e908858c19
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)
 2017-02-17 12:11:03 +01:00
Jacek Jendrzej
144fbcba14 src/driver/scanepg.cpp avoid possible segfault 
Origin commit data
------------------
Commit: 4bfe34bf5d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)
 2017-02-17 11:09:53 +01:00
vanhofen
8e781dcf7e lib/libtuxtxt/tuxtxt.cpp: align to seife and tuxbox 
Origin commit data
------------------
Commit: a687bccace
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)

Origin message was:
------------------
- lib/libtuxtxt/tuxtxt.cpp: align to seife and tuxbox
 2017-02-15 22:59:24 +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
Michael Liebmann
b37a04311e tuxtxt: Fix display in 1280x720 mode 
Origin commit data
------------------
Commit: 979bac14f0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 20:24:41 +01:00
Michael Liebmann
dd6b4d740d Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: aa5f8e9a65
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 18:40:47 +01:00
Michael Liebmann
f2e312a727 fb_accel_cs_hd2: add missing getBackBufferPointer() 
Origin commit data
------------------
Commit: 84edb25f3f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-15 (Wed, 15 Feb 2017)
 2017-02-15 18:39:02 +01:00