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
15,439 Commits 2 Branches 9 Tags
f2cb67ff749a75c8121a000222a25ee9fe90f5e6
Commit Graph

117 Commits

Author SHA1 Message Date
TangoCash
5f05b66aa7 supplemental to 4071ffd3deb55898de680a8cfd8ac1085a41a4f7 
Origin commit data
------------------
Commit: b298789767
Author: TangoCash <eric@loxat.de>
Date: 2021-01-31 (Sun, 31 Jan 2021)
 2021-01-31 18:21:43 +01:00
Thilo Graf
e7eb96a8e3 remotecontrol: avoid possible compiler warnings with -Wignored-qualifiers 
Leading const should be superfluous.


Origin commit data
------------------
Commit: 515f61d4ab
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-01-23 (Thu, 23 Jan 2020)
 2020-01-23 21:15:52 +01:00
Thilo Graf
0081f4f125 src/daemonc/remotecontrol.cpp: fix possible code errors 
code should be UTF8


Origin commit data
------------------
Commit: 187acdccd9
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-10-03 (Wed, 03 Oct 2018)
 2018-10-03 18:01:22 +02:00
Stefan Seyfried
cfa463f606 reduce dependencies on driver/rcinput.h 
* add new header that only contains neutrino_msg_t and friends, often this
 is all that's needed instead of full rcinput.h
* directly include rcinput.h in some cpp files instead of relying on
 accidental inclusion in some header
* add class forward declarations to avoid dragging in rcinput indirectly
This could use more work to further reduce the impact; maybe separating
the CRCinput::key_* constants from the rcinput class would be good.


Origin commit data
------------------
Commit: 47fbfbed9b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-15 (Mon, 15 Jan 2018)

Origin message was:
------------------
reduce dependencies on driver/rcinput.h

* add new header that only contains neutrino_msg_t and friends, often this
 is all that's needed instead of full rcinput.h
* directly include rcinput.h in some cpp files instead of relying on
 accidental inclusion in some header
* add class forward declarations to avoid dragging in rcinput indirectly
This could use more work to further reduce the impact; maybe separating
the CRCinput::key_* constants from the rcinput class would be good.
 2018-01-15 19:54:51 +01:00
vanhofen
6ec75f739e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 0113efac9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)
 2017-11-13 21:25:41 +01:00
Jacek Jendrzej
47be7fdb01 fix audio description after play movie 
Origin commit data
------------------
Commit: 54c5d19e1a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-13 (Mon, 13 Nov 2017)
 2017-11-13 19:42:12 +01:00
vanhofen
25d7baf5ba remotecontrol: resolv commented merge conflict 
Origin commit data
------------------
Commit: 0a0d57cfe6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-10 (Fri, 10 Nov 2017)

Origin message was:
------------------
- remotecontrol: resolv commented merge conflict
 2017-11-10 22:47:24 +01:00
vanhofen
00653d3f8a try to fix tv <-> radio switch 
Origin commit data
------------------
Commit: e105155830
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- try to fix tv <-> radio switch
 2017-11-03 09:36:20 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN 
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
 2017-11-03 09:36:19 +01:00
Jacek Jendrzej
079772e63d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 12:52:04 +02:00
Stefan Seyfried
89cd4ce8a4 add LUA_CFLAGS everywhere widget/menue.h is used 
Origin commit data
------------------
Commit: 9e2a7d7f79
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-26 12:41:05 +02:00
vanhofen
0d9a80486a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:36:34 +02:00
Stefan Seyfried
13d333e3e1 add LUA_CFLAGS everywhere widget/menue.h is used 
Origin commit data
------------------
Commit: 32e4947ec7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
 2017-09-25 11:25:50 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
Michael Liebmann
6192e893ab Fix merge conflicts 
Origin commit data
------------------
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-20 09:01:33 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
Jacek Jendrzej
899886e57c Revert "supplement to 1da21f8936b9b59f963525c117b6ae7b9cbf4bb5" 
This reverts commit 9aaa68bf47.


Origin commit data
------------------
Commit: ee9addceb0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-05 (Tue, 05 Apr 2016)
 2016-04-05 17:38:25 +02:00
Jacek Jendrzej
9aaa68bf47 supplement to 1da21f8936 
Origin commit data
------------------
Commit: f684fd50a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-05 (Tue, 05 Apr 2016)
 2016-04-05 17:17:47 +02:00
Jacek Jendrzej
1da21f8936 src/daemonc/remotecontrol.cpp: fix PARENTALLOCK in onsignal mode 
Origin commit data
------------------
Commit: 2c700641c1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-05 (Tue, 05 Apr 2016)
 2016-04-05 16:53:40 +02:00
Jacek Jendrzej
987757d215 fix AddressSanitizer: strncpy-param-overlap: memory ranges 
Origin commit data
------------------
Commit: d96f15fb6c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
 2016-02-24 18:46:12 +01:00
Stefan Seyfried
39dc8769cc Merge remote-tracking branch 'cst-next' 
Origin commit data
------------------
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)
 2016-01-16 12:51:04 +01:00
Michael Liebmann
3c98408295 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)
 2016-01-16 07:22:31 +01:00
Stefan Seyfried
df903525f5 port HWLIB_CFLAGS from neutrino-mp to neutrino-hd 
Origin commit data
------------------
Commit: 79d800f955
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)

Origin message was:
------------------
- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd
 2016-01-14 22:29:00 +01:00
Stefan Seyfried
fe29d97607 fix build with newer openSUSE ffmpeg packages (again) 
Origin commit data
------------------
Commit: d3245a4f90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 18:16:16 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
[CST] Focus
5fb4c7ec6d daemonc/remotecontrol.cpp: remove commented setServiceChanged calls 
Origin commit data
------------------
Commit: ffe7973e31
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)
 2015-06-02 12:26:22 +03:00
vanhofen
2f0e76ff67 record.h: remove include of vfd.h; use display.h instead 
Origin commit data
------------------
Commit: 09adc177d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)

Origin message was:
------------------
- record.h: remove include of vfd.h; use display.h instead
 2015-04-16 13:39:35 +02:00
Stefan Seyfried
54f4c66ad9 remotecontrol: disable audio pid debug messages 
Origin commit data
------------------
Commit: 5c7acc9b7b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-22 (Sun, 22 Feb 2015)
 2015-02-22 00:43:25 +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
d65606a2b4 neutrino.cpp: try to fix timeshift stop/restart, 
after quit from playback audioplayer, picture viewer and so on


Origin commit data
------------------
Commit: ecff984432
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
 2015-01-21 18:00:25 +03:00
Stefan Seyfried
06f8b4b28c add CFLAGS for libsigc 
Origin commit data
------------------
Commit: a92eb8f8e7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-02 (Fri, 02 Jan 2015)
 2015-01-02 21:00:18 +01:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
467fc487aa add CFLAGS for libsigc 
Origin commit data
------------------
Commit: 41dd237498
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:11:36 +01: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
9b0bc08d30 daemonc/remotecontrol.cpp: stop playback before lock on cst too, 
this fixes blank video and background picture in ie audioplayer started on locked channel


Origin commit data
------------------
Commit: 97875b4855
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-23 (Tue, 23 Dec 2014)
 2014-12-23 19:08:01 +03:00
[CST] Bas
8f536ee896 neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me. 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
 2014-10-22 16:14:05 +04:00
[CST] Focus
51cced09df zapit/src/channel.cpp: add bLocked flag to lock single channel 
Origin commit data
------------------
Commit: ab2be9aeb0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-13 (Mon, 13 Oct 2014)
 2014-10-13 16:36:46 +04:00
[CST] Focus
650aebc7df neutrino.cpp: add adjustToChannelID(); 
add flags for accurate saving of things changed in channel list;
always add favorites bouquet to favorite bouquet list;
cleanup showChannelList()


Origin commit data
------------------
Commit: bdeb3b50de
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)
 2014-10-10 15:26:32 +04:00
[CST] Focus
2ae1f357c5 daemonc/remotecontrol.cpp: fix copy-paste, 
from commit 74fd8f361f


Origin commit data
------------------
Commit: d63de0902d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
 2014-09-22 11:10:06 +04:00
[CST] Focus
3738250243 neutrino: stop EIT read before zap 
Origin commit data
------------------
Commit: 3513f9830a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
 2014-09-02 12:59:21 +04: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
martii
76bdfe13e0 zapit/bouquets: rename bAlwaysLocked => bLockCount 
Origin commit data
------------------
Commit: 3a52a97fce
Author: martii <m4rtii@gmx.de>
Date: 2014-05-25 (Sun, 25 May 2014)
 2014-05-25 18:43:46 +02:00
martii
39933ac1dd zapit/bouquets: count locked bouquets a channels is in, and honor lock in all bouquets 
Origin commit data
------------------
Commit: abe03ad749
Author: martii <m4rtii@gmx.de>
Date: 2014-05-25 (Sun, 25 May 2014)
 2014-05-25 18:43:38 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
Jacek Jendrzej
767d3d5a7e use auto lang only with more as 1 audio pid 
Origin commit data
------------------
Commit: 3d71258d31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-18 (Fri, 18 Apr 2014)
 2014-04-18 19:27:08 +02:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 22:51:23 +01:00
martii
ce44d1641a convert most char[...] configuration values to std::string 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
 2013-12-25 12:08:14 +01:00
Stefan Seyfried
cad1d8804d startvideo: send PMT again 
this needs checking if the refcounting issues have
been fixed now.


Origin commit data
------------------
Commit: 29c47133fd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
 2013-11-30 16:07:11 +01:00
Stefan Seyfried
4d7f78c8a0 Makefiles: simplify includes for libcoolstream/libstb-hal 
Origin commit data
------------------
Commit: 3a728f9ee1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)
 2013-11-11 21:51:08 +01:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00