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

1142 Commits

Author SHA1 Message Date
vanhofen
497db594c1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)
 2017-05-16 15:28:08 +02:00
vanhofen
53007ef0a9 movieplayer: make bisection jump period configurable 
Origin commit data
------------------
Commit: 69e5cb286c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- movieplayer: make bisection jump period configurable
 2017-05-16 15:26:20 +02:00
vanhofen
77ac470486 movieplayer: allow bisectional jumps with RC_page_up/down 
based upon code by TangoCash


Origin commit data
------------------
Commit: ca218e5390
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-13 (Sat, 13 May 2017)

Origin message was:
------------------
- movieplayer: allow bisectional jumps with RC_page_up/down

based upon code by TangoCash
 2017-05-13 17:45:59 +02:00
gixxpunk
ff8ad12d1b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4c0d6c0930
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-09 (Tue, 09 May 2017)
 2017-05-09 18:36:27 +02:00
vanhofen
3e0a8d3ff0 clearify comment 
Origin commit data
------------------
Commit: c08144a9d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- clearify comment
 2017-05-09 13:31:59 +02:00
vanhofen
6c8e98d454 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4b76adcc02
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 23:50:19 +02:00
vanhofen
a76db329fa Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 71b9627b6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 23:46:54 +02:00
vanhofen
2d4130dab8 neutrino: fix hw_caps init; it must be initialized after zapit start 
Origin commit data
------------------
Commit: edb0a5937e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- neutrino: fix hw_caps init; it must be initialized after zapit start
 2017-05-08 23:44:45 +02:00
vanhofen
ff7fc4971a Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	acinclude.m4
	src/neutrino.cpp


Origin commit data
------------------
Commit: 7f989a3625
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)
 2017-03-31 17:47:29 +02:00
vanhofen
bb03a67aa7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 053d97363c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 21:02:27 +02:00
vanhofen
dd6d985e19 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


Origin commit data
------------------
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 08:05:10 +02:00
Michael Liebmann
841a7b077e Fix videosystem auto mode 
Origin commit data
------------------
Commit: b612c1f620
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 23:56:57 +02:00
vanhofen
c271e77e9d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: a9842aa1d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)
 2017-03-26 23:25:43 +02:00
vanhofen
7e99dfa7d7 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: b435c29e1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)
 2017-03-26 23:24:10 +02:00
Michael Liebmann
0541c8a8e7 CFbAccelCSHD2::setMode: Fix if ENABLE_CHANGE_OSD_RESOLUTION is not defined 
Origin commit data
------------------
Commit: 515ab1fe59
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)
 2017-03-23 21:32:48 +01:00
Michael Liebmann
a080cf7880 src/neutrino.cpp: Simplification EVT_AUTO_SET_VIDEOSYSTEM handling 
Origin commit data
------------------
Commit: ea18657562
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)
 2017-03-23 21:32:48 +01:00
vanhofen
95c6d6c593 Merge branch 'master' into pu/mp 
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: b1ba85c8c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-22 (Wed, 22 Mar 2017)
 2017-03-22 12:16:01 +01:00
vanhofen
bd2ebb40b4 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 107a8a1b5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)
 2017-03-21 14:50:23 +01:00
vanhofen
8fb400c914 neutrino: grab whole ExitRun() from neutrino-mp ... 
This fixes my last merge commit, small typos and alignes indentation.


Origin commit data
------------------
Commit: d2f02371e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)

Origin message was:
------------------
- neutrino: grab whole ExitRun() from neutrino-mp ...

This fixes my last merge commit, small typos and alignes indentation.
 2017-03-21 10:29:35 +01:00
Michael Liebmann
7b7ca63ebe Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 8212746cf1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
 2017-03-20 23:11:33 +01:00
vanhofen
986db03a13 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e43defd2a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
 2017-03-20 21:23:44 +01:00
Jacek Jendrzej
267889edb0 fix segfault aufter unbreak msgbox c6a36ed677 
Origin commit data
------------------
Commit: 8516b1662d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
 2017-03-20 17:40:26 +01:00
vanhofen
2691bb1543 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: ddbd537865
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
 2017-03-20 15:53:10 +01:00
vanhofen
8bd314111c Merge branch 'master' into pu/mp 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: b12624d1fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
 2017-03-20 01:31:51 +01:00
vanhofen
160dac5e55 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp
	src/neutrino.h
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: cd5b946202
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
 2017-03-20 00:07:18 +01:00
Michael Liebmann
5eff0ffc8c Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: be49686432
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
 2017-03-20 00:00:35 +01:00
vanhofen
02147fb250 neutrino: just code cosmetics in ExitRun() 
Origin commit data
------------------
Commit: b8a97a97ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrino: just code cosmetics in ExitRun()
 2017-03-19 23:50:52 +01:00
vanhofen
05f28e9d08 neutrino: remove unused write_si from ExitRun() function ... 
and rename retcode to can_shutdown for a better readability


Origin commit data
------------------
Commit: ec6e863e6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrino: remove unused write_si from ExitRun() function ...

and rename retcode to can_shutdown for a better readability
 2017-03-19 23:50:52 +01:00
vanhofen
b13013dad9 use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp 
Origin commit data
------------------
Commit: de1ee8b73a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->can_shutdown; mostly ported from neutrino-mp
 2017-03-19 23:50:52 +01:00
vanhofen
111e2ac676 neutrino-cpp: fix build 
Origin commit data
------------------
Commit: 7ddea13746
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrino-cpp: fix build
 2017-03-19 20:39:59 +01:00
Michael Liebmann
bed9f96a65 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 2ca9d9c4f9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 08:38:15 +01:00
vanhofen
d9fc0a4a98 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:07:17 +01:00
vanhofen
20722a62cb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8a75efa81a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:05:31 +01:00
vanhofen
61dc45da00 use g_info.hw_caps->has_fan; remove old g_info.has_fan 
Origin commit data
------------------
Commit: 4f202b19d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->has_fan; remove old g_info.has_fan
 2017-03-19 01:04:48 +01:00
vanhofen
aa7d4ff017 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:39:43 +01:00
TangoCash
317bac3394 Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 81fb3b42fa
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 22:47:42 +01:00
vanhofen
6c57da28be Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4cab22024f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 22:47:35 +01:00
Michael Liebmann
b02e3e871e Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: b190e0c4ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 21:19:08 +01:00
Jacek Jendrzej
7764d7d1c3 src/neutrino.cpp fix possible memleak 
Origin commit data
------------------
Commit: f18ec050c7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 15:56:23 +01:00
vanhofen
14f84f0bec Merge remote-tracking branch 'neutrino-mp/master' into pu/mp 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 16:14:33 +01:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 22:03:03 +01:00
vanhofen
7dd5854d20 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/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: e7ff6d5493
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 21:59:40 +01:00
Michael Liebmann
f9abc1c985 Revert "- allow to force given osd resolution in "videosystem = auto" mode" 
This reverts commit b9472250c3.


Origin commit data
------------------
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 06:32:52 +01:00
vanhofen
77be049b29 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 10:08:13 +01:00
Michael Liebmann
55120d3b2a Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 6a531d4304
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
 2017-03-08 12:35:39 +01:00
Michael Liebmann
6fb993ee99 Add src/compatibility.h to include software-dependency macros 
Origin commit data
------------------
Commit: 87b7260c48
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
 2017-03-08 12:35:20 +01:00
Michael Liebmann
dc44b76596 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 7ad59776d1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
 2017-03-08 00:35:16 +01:00
Michael Liebmann
baf881783b Fix malloc_stats() call for newer uClibc-ng versions 
Origin commit data
------------------
Commit: b58aa9ad6f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
 2017-03-08 00:34:48 +01:00
vanhofen
f718dab341 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/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 66cbc06b01
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 23:54:02 +01:00
vanhofen
b9472250c3 allow to force given osd resolution in "videosystem = auto" mode 
Origin commit data
------------------
Commit: 6fc24e990b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- allow to force given osd resolution in "videosystem = auto" mode
 2017-03-06 23:50:15 +01:00