mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,615 Commits 2 Branches 9 Tags
682f0a7e3204db7a1307cfeec654c7cc11a0e194
Commit Graph

1374 Commits

Author SHA1 Message Date
Stefan Seyfried
71939b829a Merge remote-tracking branch 'tuxbox/master' 
probably needs some additional tweaks


Origin commit data
------------------
Commit: d4efbc0c9b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)
 2017-03-21 06:50:08 +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
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
fdda0de766 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:07:52 +01:00
Michael Liebmann
eb3e1116ac Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: bab10ee438
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:06:38 +01:00
vanhofen
459cf4d8ea port hardware_caps from Neutrino-MP 
Origin commit data
------------------
Commit: 29fd05002f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- port hardware_caps from Neutrino-MP
 2017-03-06 21:49:32 +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
vanhofen
856fc0f6da Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 13c7e927b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 20:43:50 +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
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
9f3dad285f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 10:38:14 +01:00
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