mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 07:30:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,496 Commits 2 Branches 9 Tags
6df51f5e7e2c5cb848ff0ebbdf0bb83c4e75abc3
Commit Graph

37 Commits

Author SHA1 Message Date
vanhofen
6057caae9a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:04:09 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:01:15 +01:00
Stefan Seyfried
9cc19fb187 remove spurious newlines from debug output 
Origin commit data
------------------
Commit: 6604178485
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:57:32 +01:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Stefan Seyfried
12cf6f8fa1 Revert "scanepg: only react to the correct EVT_EIT_COMPLETE" 
This reverts commit 9a31562446.

reacting to all COMPLETE events is actually correct, because
it restarts background scanning after scanning of current live
transponder is finished


Origin commit data
------------------
Commit: b486a511ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-13 (Wed, 13 Jan 2016)
 2016-01-13 21:43:47 +01:00
Stefan Seyfried
e10ab96f49 zapit/debug: remove filename hack with a more elegant one 
Origin commit data
------------------
Commit: 2ee9ca5471
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-10 18:33:27 +01:00
Stefan Seyfried
9a31562446 scanepg: only react to the correct EVT_EIT_COMPLETE 
Origin commit data
------------------
Commit: 55be585994
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)
 2016-01-10 15:05:37 +01:00
Stefan Seyfried
b591c390ed scanepg: fix debug messages for out-of-tree build 
Origin commit data
------------------
Commit: 0105af5266
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-04 (Wed, 04 Mar 2015)
 2015-03-04 19:51:31 +01:00
Stefan Seyfried
7b9f11df7e Merge remote-tracking branch 'test/cst-next' 
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)
 2015-02-19 14:10:26 +01:00
Jacek Jendrzej
2ba8c5da37 fix compiling warnings 
Origin commit data
------------------
Commit: 1bfcad398f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-11 (Wed, 11 Feb 2015)
 2015-02-11 19:21:54 +01:00
Stefan Seyfried
a968a12b8d Merge remote-tracking branch 'check/cst-next' 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 17:26:26 +01:00
[CST] Focus
f0e1cb4cf5 gui/miscsettings_menu.cpp: add option to cache EPG only for favorite channels, 
filter not yet reconfigured after scan or editing favorite bouquets


Origin commit data
------------------
Commit: d98d94550f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)
 2015-01-22 18:58:53 +03:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
[CST] Focus
8f7f3f9e4d webtv channels integration port, 
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
 2014-08-27 17:32:26 +04:00
[CST] Focus
69ea473390 gui/miscsettings_menu.cpp: move epg scan OFF option to epg mode, 
reorder epg settings, add separators


Origin commit data
------------------
Commit: 0c22682df3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-14 (Wed, 14 May 2014)
 2014-05-14 16:32:49 +04:00
Stefan Seyfried
6fa76f2532 scanepg: fix format-string warnings 
Origin commit data
------------------
Commit: cc56f9b238
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:26:18 +02:00
[CST] Focus
e581bc2991 driver/scanepg.cpp: add support to scan selected bouquets; 
add support to scan epg in live or standby or always


Origin commit data
------------------
Commit: 992ee59685
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)
 2014-03-27 18:56:49 +04:00
[CST] Focus
a9829fc70c driver/scanepg.cpp: do not zap, if streaming active; 
use common standbyToStandby() from neutrino


Origin commit data
------------------
Commit: 63ce8f2a69
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-26 (Wed, 26 Mar 2014)
 2014-03-26 14:31:04 +04:00
Jacek Jendrzej
c0dd1fa4ef CEpgScan::Start: fix epgscan start in standby 
Origin commit data
------------------
Commit: e59ca796d0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 13:14:18 +01:00
[CST] Focus
9a85cd7950 driver/scanepg.cpp: do not restart rescan timer every end of scan 
Origin commit data
------------------
Commit: f3fdbca8cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-21 (Sat, 21 Dec 2013)
 2013-12-21 14:03:35 +04:00
[CST] Focus
b60404f5f9 driver/scanepg.cpp: add timer to rescan epg every 24 hours 
Origin commit data
------------------
Commit: bf520e26fc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)
 2013-12-20 16:43:37 +04:00
Stefan Seyfried
548682c664 scanepg: fix unused variable warning 
Origin commit data
------------------
Commit: 0481b1f2af
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-13 10:38:36 +01:00
[CST] Focus
25123ff234 driver/scanepg.cpp, neutrino.cpp: fix for standby epg scan 
Origin commit data
------------------
Commit: 3a120da68d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-11 (Mon, 11 Nov 2013)
 2013-11-11 14:07:03 +04:00
[CST] Focus
92079d91d9 driver/scanepg.cpp: return handled for events not handled in other code, 
should fix crashes on double-free problem


Origin commit data
------------------
Commit: d4cf498279
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-20 (Sun, 20 Oct 2013)
 2013-10-20 14:38:06 +04:00
[CST] Focus
741d8dd1dd driver/scanepg.cpp: change handleMsg() to return event handled/unhandled 
Origin commit data
------------------
Commit: 3863008e3a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)
 2013-10-17 19:14:02 +04:00
[CST] Focus
6f80394cbe driver/scanepg.cpp: fix wrong favorites adding in bouquet mode; 
fix current bouquet check in case channel mode is changed;
save/restore live channel id in standby scan


Origin commit data
------------------
Commit: 3686c86232
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
 2013-10-11 17:03:14 +04:00
Jacek Jendrzej
bb2e08a742 fix compil warnings 
Origin commit data
------------------
Commit: 857514a8cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)
 2013-10-10 19:30:11 +02:00
[CST] Focus
f275d04349 src/driver/scanepg.cpp: add support for standby epg scan; 
block scan if recording is running;
experimental, needs more testing


Origin commit data
------------------
Commit: 201fb60262
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)
 2013-10-10 19:01:46 +04:00
[CST] Focus
ea128d69e4 driver/scanepg.cpp: prefer current bouquet in favorite mode, 
adding other favorites when current is finished


Origin commit data
------------------
Commit: 27dc2ba888
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
 2013-10-07 16:46:56 +04:00
[CST] Focus
a5a8e2719e driver/scanepg.cpp: reuse code, do not try to add favorites again if scan complete 
Origin commit data
------------------
Commit: f2f3737c10
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
 2013-10-07 16:46:56 +04:00
[CST] Focus
cae9925667 driver/scanepg.cpp: add support to scan all favorites 
Origin commit data
------------------
Commit: 3ccd5cca68
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)
 2013-10-02 15:30:44 +04:00
[CST] Focus
913afc0293 driver/record.cpp, driver/scanepg.cpp, zapit/src/zapit.cpp: try to prevent race 
while lock/allocate frontend in case of possible concurrent usage in neutrino and zapit threads


Origin commit data
------------------
Commit: cdb0e0ef21
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)
 2013-08-13 20:10:02 +04:00
[CST] Focus
da986056b6 driver/scanepg.cpp: fix copy/paste 
Origin commit data
------------------
Commit: 79845b8fe2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)
 2013-08-13 20:10:02 +04:00
[CST] Focus
a559a71bda driver/scanepg.cpp: try to make zap for epg scan non-blocking 
Origin commit data
------------------
Commit: 46980f524d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)
 2013-08-13 20:10:02 +04:00
Michael Liebmann
a9ddcb3f0a scan epg: fix shadow warning 
- fix display menuhint


Origin commit data
------------------
Commit: 7833cd4dc6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
 2013-06-12 17:50:10 +02:00
[CST] Focus
ac2654f628 add experimental support to scan epg in background using different tuner, 
when enabled in menu - activated by next channel switch,
scanning epg for channels (transponders) in current bouquet (channels list)


Origin commit data
------------------
Commit: 8e6202071e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
 2013-06-12 18:46:34 +04:00