Commit Graph

840 Commits

Author SHA1 Message Date
vanhofen
dc5e876bfa neutrino: introduce WEBRADIODIR and WEBRADIODIR_VAR
Origin commit data
------------------
Commit: b06fdf8b27
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-25 (Tue, 25 Sep 2018)

Origin message was:
------------------
- neutrino: introduce WEBRADIODIR and WEBRADIODIR_VAR
2018-09-25 23:53:35 +02: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
5d4f20bed6 nhttpd: re-add CDATA attribute to xml output to keep compatibility with some plugins
Origin commit data
------------------
Commit: db458bc52b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-02 (Mon, 02 Apr 2018)

Origin message was:
------------------
- nhttpd: re-add CDATA attribute to xml output to keep compatibility with some plugins
2018-04-02 21:15:06 +02:00
TangoCash
030e643dbb fix webif xml encoding, part 2
Origin commit data
------------------
Commit: 6b449f5d95
Author: TangoCash <eric@loxat.de>
Date: 2018-03-28 (Wed, 28 Mar 2018)
2018-03-28 22:24:19 +02:00
TangoCash
761ca2064b fix webif xml encoding
Origin commit data
------------------
Commit: 0d4c7b2bb2
Author: TangoCash <eric@loxat.de>
Date: 2016-04-03 (Sun, 03 Apr 2016)
2018-03-27 22:04:35 +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
a6956b7c37 neutrinoapi: update getCryptInfoAsString()
Origin commit data
------------------
Commit: 1110206d03
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-21 (Sun, 21 Jan 2018)

Origin message was:
------------------
- neutrinoapi: update getCryptInfoAsString()
2018-01-21 21:31:58 +01:00
GetAway
226e8db7c7 neutrinoapi.cpp: fix path to iso tab introduced with a9881b3
Origin commit data
------------------
Commit: e5d8760852
Author: GetAway <get-away@t-online.de>
Date: 2018-01-21 (Sun, 21 Jan 2018)
2018-01-21 20:50:18 +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
Stefan Seyfried
69dd02f458 neutrinoyparser: fix invalid logic in func_unmount_get_list
Origin commit data
------------------
Commit: ea30b22119
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
2017-09-26 12:41:05 +02:00
Stefan Seyfried
d41f19b667 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Commit: 971f3703a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
2017-09-26 12:41:05 +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
1c9982f2c9 neutrinoyparser: fix invalid logic in func_unmount_get_list
Origin commit data
------------------
Commit: e04eb24ff4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:51 +02:00
Stefan Seyfried
0e185cdc08 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Commit: 0ea72b9d51
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
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
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
d0dc31ae8d Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/update_settings.cpp


Origin commit data
------------------
Commit: aeebd0d444
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 16:30:58 +02:00
vanhofen
fb0a25d759 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 16:23:15 +02:00
vanhofen
2aaa136ee1 nhttpd: remove unused string Dbox_Hersteller
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6c2fc16ea4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: remove unused string Dbox_Hersteller

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
5e8e7c52ad nhttpd: de-capitalize hooknames for controlapi and neutrinoyparser
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 0634228f50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: de-capitalize hooknames for controlapi and neutrinoyparser

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
89f338ef9e nhttpd: fix typo in LOG_FILE define
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 1beb317202
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: fix typo in LOG_FILE define

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
62a556fe49 nhttpd: move defines for SSL-certs after HTTPD_CONFIGDIR define
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 9a1215d6d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: move defines for SSL-certs after HTTPD_CONFIGDIR define

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
184574eb25 nhttpd: use PORT-defines from yconfig.h instead of "hardcoded" ports
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 0738d2af53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-06 (Wed, 06 Sep 2017)

Origin message was:
------------------
- nhttpd: use PORT-defines from yconfig.h instead of "hardcoded" ports

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
a4b4a6c192 nhttpd: fix indentations
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: aeca17ea2c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: fix indentations

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
827a823b9c nhttpd: small re-sorts; TODO: fix $Revision$ replacements
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 01a685c1ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: small re-sorts; TODO: fix $Revision$ replacements

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
3d10948e4c nhttpd: sort entrys in Makefile.am
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 1a80fe4568
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: sort entrys in Makefile.am

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
32fef2ba69 nhttpd: remove unused mod_testhook
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: f5447b96ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove unused mod_testhook

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
7618569ac3 nhttpd: just code-reformats; fix indentation
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 669bce995a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: just code-reformats; fix indentation

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
abcbaede4e nhttpd: resort defines
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 00462eb79c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: resort defines

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
0d387b188d nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch
Signed-off-by: Thilo Graf <dbt@novatux.de>

Some changes was different.


Origin commit data
------------------
Commit: 488154ceb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch

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

Some changes was different.
2017-09-14 12:14:41 +02:00
vanhofen
f16f33bf49 nhttpd: just cosmetics (remove annoying linebreaks)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: ae23144065
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: just cosmetics (remove annoying linebreaks)

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
50491b6859 nhttpd: remove obsolete function to show commandline help
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: d7e34d533d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove obsolete function to show commandline help

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00