Commit Graph

42 Commits

Author SHA1 Message Date
vanhofen
7baaedf34d neutrino: clearify mode handling in saveEpg() function
Conflicts:
	src/driver/scanepg.cpp
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9645cb24d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: clearify mode handling in saveEpg() function

 Conflicts:
	src/driver/scanepg.cpp
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
eeb21f6510 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fc3e793a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
13319437b7 scanepg: rename webtv => webchan
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3946379f41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- scanepg: rename webtv => webchan

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-16 19:43:26 +01:00
vanhofen
34e83914e4 rename IS_WEBTV => IS_WEBCHAN
Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 740fd3ac0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

 Conflicts:
	src/zapit/src/capmt.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-11-16 19:43:26 +01:00
Jacek Jendrzej
80887f7906 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72a9fa40db
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-07-05 (Wed, 05 Jul 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-07-05 21:43:36 +02:00
vanhofen
5820d8a8a0 epgscan: allow to set rescan period to catch a bug in epgscan
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 761a2b2e73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-07-04 12:22:53 +02:00
Stefan Seyfried
4635eb375c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c95139207
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-22 08:44:53 +01:00
Jacek Jendrzej
cb5ab71294 src/driver/scanepg.cpp avoid possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bfe34bf5d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-17 (Fri, 17 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-17 11:09:53 +01:00
Stefan Seyfried
f64fb649b2 remove spurious newlines from debug output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6604178485
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-12 22:57:32 +01:00
Stefan Seyfried
f028e0d941 remove spurious newlines from debug output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fa91ad136
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-12 15:18:35 +01:00
Stefan Seyfried
137775e41d Revert "scanepg: only react to the correct EVT_EIT_COMPLETE"
This reverts commit 084df58021.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: b486a511ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-13 (Wed, 13 Jan 2016)



------------------
This commit was generated by Migit
2016-01-13 21:43:47 +01:00
Stefan Seyfried
8b28e6737f zapit/debug: remove filename hack with a more elegant one
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ee9ca5471
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-10 18:33:27 +01:00
Stefan Seyfried
084df58021 scanepg: only react to the correct EVT_EIT_COMPLETE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55be585994
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-10 15:05:37 +01:00
Stefan Seyfried
89a039fc90 scanepg: fix debug messages for out-of-tree build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0105af5266
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-04 (Wed, 04 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-04 19:51:31 +01:00
Stefan Seyfried
e4e9fb1e46 Merge remote-tracking branch 'test/cst-next'
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)



------------------
This commit was generated by Migit
2015-02-19 14:10:26 +01:00
Jacek Jendrzej
3240811349 fix compiling warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bfcad398f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-11 (Wed, 11 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-11 19:21:54 +01:00
Stefan Seyfried
2263c8bd2e 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
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
[CST] Focus
7f0ac9a93b 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
------------------
Branch: ni/coolstream
Commit: d98d94550f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)



------------------
This commit was generated by Migit
2015-01-22 18:58:53 +03:00
Stefan Seyfried
c8e3ec41a9 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
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
[CST] Focus
92a6be85f7 gui/miscsettings_menu.cpp: move epg scan OFF option to epg mode,
reorder epg settings, add separators


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c22682df3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-14 (Wed, 14 May 2014)



------------------
This commit was generated by Migit
2014-05-14 16:32:49 +04:00
Stefan Seyfried
7abb033d77 scanepg: fix format-string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc56f9b238
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-27 19:26:18 +02:00
[CST] Focus
2dfddb596c driver/scanepg.cpp: add support to scan selected bouquets;
add support to scan epg in live or standby or always


Origin commit data
------------------
Branch: ni/coolstream
Commit: 992ee59685
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)



------------------
This commit was generated by Migit
2014-03-27 18:56:49 +04:00
[CST] Focus
a16d70cad8 driver/scanepg.cpp: do not zap, if streaming active;
use common standbyToStandby() from neutrino


Origin commit data
------------------
Branch: ni/coolstream
Commit: 63ce8f2a69
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-26 (Wed, 26 Mar 2014)



------------------
This commit was generated by Migit
2014-03-26 14:31:04 +04:00
Jacek Jendrzej
a929c9e6bf CEpgScan::Start: fix epgscan start in standby
Origin commit data
------------------
Branch: ni/coolstream
Commit: e59ca796d0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-25 13:14:18 +01:00
[CST] Focus
3f70264434 driver/scanepg.cpp: do not restart rescan timer every end of scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3fdbca8cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-21 (Sat, 21 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-21 14:03:35 +04:00
[CST] Focus
697b013dc1 driver/scanepg.cpp: add timer to rescan epg every 24 hours
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf520e26fc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-20 16:43:37 +04:00
Stefan Seyfried
5e6d20e96f scanepg: fix unused variable warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0481b1f2af
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:38:36 +01:00
[CST] Focus
e9c2d66a7e driver/scanepg.cpp, neutrino.cpp: fix for standby epg scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a120da68d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-11 (Mon, 11 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-11 14:07:03 +04:00
[CST] Focus
0fe09e964f driver/scanepg.cpp: return handled for events not handled in other code,
should fix crashes on double-free problem


Origin commit data
------------------
Branch: ni/coolstream
Commit: d4cf498279
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-20 (Sun, 20 Oct 2013)



------------------
This commit was generated by Migit
2013-10-20 14:38:06 +04:00
[CST] Focus
118adb2620 driver/scanepg.cpp: change handleMsg() to return event handled/unhandled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3863008e3a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-17 19:14:02 +04:00
[CST] Focus
de9af9e763 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
------------------
Branch: ni/coolstream
Commit: 3686c86232
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)



------------------
This commit was generated by Migit
2013-10-11 17:03:14 +04:00
Jacek Jendrzej
484fce4d63 fix compil warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 857514a8cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-10 19:30:11 +02:00
[CST] Focus
3e9eff7326 src/driver/scanepg.cpp: add support for standby epg scan;
block scan if recording is running;
experimental, needs more testing


Origin commit data
------------------
Branch: ni/coolstream
Commit: 201fb60262
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)



------------------
This commit was generated by Migit
2013-10-10 19:01:46 +04:00
[CST] Focus
e92a2d932d driver/scanepg.cpp: prefer current bouquet in favorite mode,
adding other favorites when current is finished


Origin commit data
------------------
Branch: ni/coolstream
Commit: 27dc2ba888
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)



------------------
This commit was generated by Migit
2013-10-07 16:46:56 +04:00
[CST] Focus
a1e3c9a49c driver/scanepg.cpp: reuse code, do not try to add favorites again if scan complete
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2f3737c10
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-07 16:46:56 +04:00
[CST] Focus
f787a43d5d driver/scanepg.cpp: add support to scan all favorites
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ccd5cca68
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-02 15:30:44 +04:00
[CST] Focus
715e241852 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
------------------
Branch: ni/coolstream
Commit: cdb0e0ef21
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)



------------------
This commit was generated by Migit
2013-08-13 20:10:02 +04:00
[CST] Focus
42b7cd25f5 driver/scanepg.cpp: fix copy/paste
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79845b8fe2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-08-13 20:10:02 +04:00
[CST] Focus
ff66dad748 driver/scanepg.cpp: try to make zap for epg scan non-blocking
Origin commit data
------------------
Branch: ni/coolstream
Commit: 46980f524d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-08-13 20:10:02 +04:00
Michael Liebmann
1a507a05c6 scan epg: fix shadow warning
- fix display menuhint


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7833cd4dc6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)



------------------
This commit was generated by Migit
2013-06-12 17:50:10 +02:00
[CST] Focus
3d58e6ecd7 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
------------------
Branch: ni/coolstream
Commit: 8e6202071e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)



------------------
This commit was generated by Migit
2013-06-12 18:46:34 +04:00