Commit Graph

146 Commits

Author SHA1 Message Date
vanhofen
fa71a43168 timerlist/controlapi: handle epg_id as channel_id
Origin commit data
------------------
Commit: 1dd6614569
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-27 (Sat, 27 Apr 2019)

Origin message was:
------------------
- timerlist/controlapi: handle epg_id as channel_id
2019-04-27 13:07:55 +02:00
vanhofen
b821155c6c webtv/xmltv: add remote hostname as group prefix to see where the stream is come from
Origin commit data
------------------
Commit: 3d669081fd
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-21 (Fri, 21 Dec 2018)

Origin message was:
------------------
- webtv/xmltv: add remote hostname as group prefix to see where the stream is come from
2018-12-21 23:50:26 +01:00
vanhofen
6622c995a9 move compatibility headers to /lib/hardware
Origin commit data
------------------
Commit: 651a56aab8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-21 (Fri, 21 Dec 2018)

Origin message was:
------------------
- move compatibility headers to /lib/hardware
2018-12-21 22:30:34 +01:00
GetAway
a6068ecb02 rcinput: use translation for some keys
Origin commit data
------------------
Commit: f633ff3b96
Author: GetAway <get-away@t-online.de>
Date: 2018-12-05 (Wed, 05 Dec 2018)
2018-12-05 23:15:54 +01:00
TangoCash
1b88257ce4 fix xmltv time offsets
Origin commit data
------------------
Commit: 7e5029e75d
Author: TangoCash <eric@loxat.de>
Date: 2018-10-28 (Sun, 28 Oct 2018)
2018-10-28 13:06:12 +01:00
vanhofen
d0f7010036 controlapi: fix xmltv.m3u output for channels without logo
Origin commit data
------------------
Commit: 3f35d40e4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-09 (Sun, 09 Sep 2018)

Origin message was:
------------------
- controlapi: fix xmltv.m3u output for channels without logo
2018-09-09 14:09:43 +02:00
vanhofen
41fc60c435 controlapi: minor changes in url creation in xmltvm3uCGI() function
Origin commit data
------------------
Commit: d5c3c9a963
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-09 (Sun, 09 Sep 2018)

Origin message was:
------------------
- controlapi: minor changes in url creation in xmltvm3uCGI() function
2018-09-09 13:26:51 +02:00
vanhofen
43840631fa controlapi: reformat CControlAPI::xmltvm3uCGI() function; no other changes
Origin commit data
------------------
Commit: a68703b238
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-09 (Sun, 09 Sep 2018)

Origin message was:
------------------
- controlapi: reformat CControlAPI::xmltvm3uCGI() function; no other changes
2018-09-09 13:26:51 +02:00
TangoCash
377fdeea07 fix logo url, white space in xmltv.m3u
Origin commit data
------------------
Commit: 2ca0e70a57
Author: TangoCash <eric@loxat.de>
Date: 2018-09-09 (Sun, 09 Sep 2018)
2018-09-09 13:06:05 +02:00
vanhofen
317258904f neutrino: add localized bouquet names
Origin commit data
------------------
Commit: ad7d094635
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-04 (Tue, 04 Sep 2018)

Origin message was:
------------------
- neutrino: add localized bouquet names
2018-09-04 06:12:39 +02:00
TangoCash
d3a4e84bc1 fixes for xmltv epg
Origin commit data
------------------
Commit: 8c5b400e80
Author: TangoCash <eric@loxat.de>
Date: 2018-09-01 (Sat, 01 Sep 2018)
2018-09-01 15:58:24 +02:00
vanhofen
710088bc0f nhttpd/controlapi: make CDATA attribute in xml output switchable to fix xmltv.data
Origin commit data
------------------
Commit: c747e37e9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-04 (Wed, 04 Apr 2018)

Origin message was:
------------------
- nhttpd/controlapi: make CDATA attribute in xml output switchable to fix xmltv.data
2018-04-04 23:19:59 +02:00
vanhofen
61e608e114 controlapi: fix key translation for hd51; small code alignments
Origin commit data
------------------
Commit: 94f64ff3d7
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-22 (Mon, 22 Jan 2018)

Origin message was:
------------------
- controlapi: fix key translation for hd51; small code alignments
2018-01-22 23:17:34 +01:00
Jacek Jendrzej
9ef16b926b add revert translate to webif rc
Origin commit data
------------------
Commit: f336d4b471
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-01-22 (Mon, 22 Jan 2018)
2018-01-22 23:17:34 +01:00
Jacek Jendrzej
65981a8492 try to fix rc over webif on hd51
Origin commit data
------------------
Commit: a21fb645ac
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-01-22 (Mon, 22 Jan 2018)
2018-01-22 23:17:34 +01:00
vanhofen
3990a3e4e7 controlapi: fix control of external plugins (e.g. msgbox or shellexec)
We have to send the keys directyl to rc-device instead of using g_RCInput->postMsg()


Origin commit data
------------------
Commit: 06a6608413
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-19 (Fri, 19 Jan 2018)

Origin message was:
------------------
- controlapi: fix control of external plugins (e.g. msgbox or shellexec)

We have to send the keys directyl to rc-device instead of using g_RCInput->postMsg()
2018-01-19 10:24:02 +01:00
vanhofen
dc27f0567c infoicons: avoid extern CInfoIcons; use getInstance() instead of this
Origin commit data
------------------
Commit: 5a34b06137
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- infoicons: avoid extern CInfoIcons; use getInstance() instead of this
2018-01-03 10:49:50 +01:00
vanhofen
4f2ee07da4 controlapi: fix typo in 016c5f8a23
Origin commit data
------------------
Commit: 069774f84c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)

Origin message was:
------------------
- controlapi: fix typo in 016c5f8a23
2017-11-23 17:23:01 +01:00
vanhofen
016c5f8a23 controlapi: add mode_webradio to GetModeCGI()
Origin commit data
------------------
Commit: 110588d39b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- controlapi: add mode_webradio to GetModeCGI()
2017-11-20 15:19:06 +01:00
vanhofen
8729b26638 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Commit: 028ec3cf3c
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
2017-11-20 15:19:06 +01:00
vanhofen
c2cc8c434f Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:21:37 +02:00
vanhofen
583f45fad7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:19:49 +02:00
Stefan Seyfried
c9d4fdd9cc remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-02 13:43:57 +02:00
vanhofen
5c12837f35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)
2017-09-18 21:53:44 +02:00
gixxpunk
abee9b0913 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
2017-09-18 16:31:55 +02:00
Jacek Jendrzej
14145554aa fix mem leak
Origin commit data
------------------
Commit: a7942c9987
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)
2017-09-18 08:56:02 +02:00
vanhofen
f37efba8f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
2017-09-09 08:44:18 +02:00
vanhofen
2ee7a428d9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
2017-09-09 08:43:52 +02:00
Jacek Jendrzej
b03ab5cb9e remove double includes
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)
2017-09-08 21:21:32 +02:00
vanhofen
61d41d0862 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/widget/listbox.cpp


Origin commit data
------------------
Commit: e32d5a869f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
2017-06-16 15:10:34 +02:00
vanhofen
ec01f046aa Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: b87ad3b5ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 17:32:05 +02:00
gixxpunk
24b0cc251b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 62498909da
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 16:46:45 +02:00
TangoCash
20c1a160bc [RemoteTimers] add possibility to transfer all timers at once via webif
Use:
http://boxip/control/sendalltimers?ip=10.1.1.xxx&force=1
http://boxip/control/sendalltimers?name=record%20box&force=true

if parameter name is given, it has to be in timerlist as remote box.
if parameter ip and name is given, ip is used.
if parameter force is set, all checks are disabled, and the local timer
will be deleted even the transfer was not successful.


Origin commit data
------------------
Commit: 7031e99573
Author: TangoCash <eric@loxat.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 16:34:19 +02: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
11240de06d controlapi: use "CST" instead of "Coolstream" ...
because I don't know the current legal situation.


Origin commit data
------------------
Commit: 9e5c30f754
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- controlapi: use "CST" instead of "Coolstream" ...

because I don't know the current legal situation.
2017-03-19 01:04:48 +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
1cb8859aa9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: d384f4e37c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
2017-03-10 15:37:03 +01:00
vanhofen
4110492797 controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION
Origin commit data
------------------
Commit: 0203de264f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return PACKAGE_NAME and PACKAGE_VERSION
2017-03-10 15:36:13 +01:00
vanhofen
a8db520beb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)
2017-03-10 15:10:04 +01:00
vanhofen
26584b4308 controlapi: use hw_caps in HWInfoCGI()
Origin commit data
------------------
Commit: b902648b08
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: use hw_caps in HWInfoCGI()
2017-03-10 15:07:52 +01:00
vanhofen
7afeaefba4 controlapi: /control/info => return right name
Origin commit data
------------------
Commit: e092059f32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)

Origin message was:
------------------
- controlapi: /control/info => return right name
2017-03-10 15:07:52 +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
vanhofen
260127f781 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
2017-03-01 13:09:50 +01:00
vanhofen
a9edf315db rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins
2017-03-01 13:03:50 +01:00
vanhofen
0a6086c182 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 6d05bd5d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
2017-02-23 12:23:43 +01:00
vanhofen
40df044204 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: de1be9b239
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
2017-02-23 12:22:30 +01:00
vanhofen
fbec2ca240 controlapi: fix perror message
Origin commit data
------------------
Commit: 7c2e25103f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)

Origin message was:
------------------
- controlapi: fix perror message
2017-02-22 15:25:04 +01:00
vanhofen
b554e7801c Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-29 15:15:34 +01:00
vanhofen
081e2c6936 controlapi: add possibility to check for updates
Origin commit data
------------------
Commit: 4183335244
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-24 (Sat, 24 Dec 2016)

Origin message was:
------------------
- controlapi: add possibility to check for updates
2016-12-24 00:28:07 +01:00