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
10,915 Commits 2 Branches 9 Tags
d9fc0a4a98e2de36830d43b51fcace243b71befe
Commit Graph

10915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
5e6e1af0ef Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 100ac0fb96
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 13:44:05 +01:00
vanhofen
afe0a772a9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4ed2244c39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 13:43:47 +01:00
vanhofen
17fd0362e1 hardware_caps: add latest coolstream models 
Origin commit data
------------------
Commit: b546ed517e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)

Origin message was:
------------------
- hardware_caps: add latest coolstream models
 2017-03-09 12:51:44 +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
Stefan Seyfried
eaa303afae bouquetlist: don't block RC keys while list is opened 
Origin commit data
------------------
Commit: 40adaa6515
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 19:55:25 +01:00
Stefan Seyfried
a5eeb66309 msgbox: deobfuscate assignment of default result value 
Origin commit data
------------------
Commit: 17f5a63d63
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 19:46:30 +01:00
Stefan Seyfried
6d86f585cb Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 19:43:06 +01:00
Jacek Jendrzej
7364e139ad make neutrino compatible with new ffmpeg 
Origin commit data
------------------
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 15:00:17 +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
Michael Liebmann
59115888cc Fix osd mode switch in videosystem auto mode 
Origin commit data
------------------
Commit: 1bb9fc6687
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 23:50:15 +01:00
vanhofen
b5ce0f99fb Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Commit: 73ea6fddcb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 23:26:32 +01:00
vanhofen
1f3de3b531 fix last merge 
Origin commit data
------------------
Commit: 19e994f0fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- fix last merge
 2017-03-06 23:11:30 +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
3a863c91f0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 22:40:18 +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
a6b0409160 configure.ac: remove duplicated code 
Origin commit data
------------------
Commit: d3c3d3760c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- configure.ac: remove duplicated code
 2017-03-06 21:49:32 +01:00
vanhofen
97391211a4 move public libcoolstream-headers to hardware directory 
Origin commit data
------------------
Commit: 2029a684e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- move public libcoolstream-headers to hardware directory
 2017-03-06 21:49:32 +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
Thilo Graf
75c7b9c6f4 CMovieBrowser/cYTFeedParser: implement signals from CProgressSignals 
Origin commit data
------------------
Commit: 8c6a47ee3a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 21:26:26 +01:00
Thilo Graf
6294294ca9 CProgressWindow/CProgressSignals: add prepared signals 
Required for inhertance of signals used with CProgressWindow.


Origin commit data
------------------
Commit: 7f511ebd1a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 21:26:26 +01:00
Thilo Graf
c88542c17a CMovieBrowser: remove wrong progress value 
Origin commit data
------------------
Commit: 26a0f31923
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 21:26:26 +01:00
Thilo Graf
4f6d09bc1f CTextBox: fix pass of SCROLL_FRAME_WIDTH 
Origin commit data
------------------
Commit: 4c388bb71c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 21:11:08 +01:00
Jacek Jendrzej
ade02e6dbb subpagetable is unsigned 
Origin commit data
------------------
Commit: e10cb00613
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
 subpagetable is unsigned
 2017-03-06 15:50:06 +01:00
Jacek Jendrzej
251b28acef src/gui/movieplayer.cpp some streams need more time pro frame 
Origin commit data
------------------
Commit: 92abe90d58
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 14:41:25 +01:00
vanhofen
6ccfc3a1c8 imdb: align timeouts; use neutrino defaults 
Origin commit data
------------------
Commit: 89a6db5416
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- imdb: align timeouts; use neutrino defaults
 2017-03-06 09:07:38 +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
vanhofen
16d41f7383 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: c3a1c04ab9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 20:43:33 +01:00
Michael Liebmann
8e90336a6c Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 77f74c5966
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 19:54:19 +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
Michael Liebmann
eead3caf46 CFbAccelCSHD2::setMode: Fix value for screeninfo.yres_virtual 
Origin commit data
------------------
Commit: 53460e54da
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
6bf879b03c msgbox: remove explicit handling of record events 
these are handled in the last else clause anyway


Origin commit data
------------------
Commit: f80f69c232
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-05 19:53:34 +01:00
Stefan Seyfried
d178f57c41 msgbox: remove duplicated code 
Origin commit data
------------------
Commit: c3ab1b91d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-05 19:53:34 +01:00
Stefan Seyfried
c6a36ed677 unbreak msgbox 
the "if (msg)" was basically always true, killing all keys that were not
handled in this clause (e.g. it was not possible to switch the box from
standby if a plugin with output was running during standby)


Origin commit data
------------------
Commit: f9b7fca210
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-05 19:53:34 +01:00
Jacek Jendrzej
0aa2b6c675 try fix YT cache wirite to root 
Origin commit data
------------------
Commit: b3f69009af
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 17:06:22 +01:00
vanhofen
7ab1fbad8d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 425d6d0035
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 15:47:58 +01:00
Jacek Jendrzej
ea3cfe55c8 src/gui/widget/msgbox.cpp init result 
Origin commit data
------------------
Commit: d5cf652763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 14:41:15 +01:00
Michael Liebmann
7cf086833f Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 52cd29a207
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 13:53:34 +01:00
Jacek Jendrzej
c2c603b7bc src/zapit/src/zapit.cpp fix segfault without services.xml 
Origin commit data
------------------
Commit: bc188c66ba
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)
 2017-03-05 13:48:40 +01:00
Stefan Seyfried
8905ab3eb1 videosettings: select VIDEOMENU_43MODE_OPTIONS at runtime 
instead of hard coded hardware dependence, select panscan and display
AR options at run time via hw_caps.


Origin commit data
------------------
Commit: c2f7e1b1c0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 20:36:56 +01:00
Stefan Seyfried
8715a4bdfe frontend: use hw_caps instead of BOXMODEL define 
Origin commit data
------------------
Commit: 2c0496be82
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 20:30:28 +01:00
Stefan Seyfried
ee422ef114 hw_caps: add caps for 14:9 AR and broken tuner driver 
Origin commit data
------------------
Commit: 3a7a202818
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 20:28:21 +01:00
Stefan Seyfried
471184a49b msgbox: remove explicit handling of record events 
these are handled in the last else clause anyway


Origin commit data
------------------
Commit: 3bcdbb39ff
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 19:56:41 +01:00