Commit Graph

12055 Commits

Author SHA1 Message Date
vanhofen
883034a60d plugin-code: cleanup from many unused code; ...
* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.

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


Origin commit data
------------------
Commit: f2ec46311c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- plugin-code: cleanup from many unused code; ...

* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
e66aaeca77 get sure we have the logo-dir, even if it's empty
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 2ace914324
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- get sure we have the logo-dir, even if it's empty

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
61dbf1cb8f rc_lock: use OFFSET defines
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: ce04716c74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- rc_lock: use OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
b46d45bfe0 don't save conf-files to flash; use /media by default
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6649ac6438
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- don't save conf-files to flash; use /media by default

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
9299fe4fb7 locale: small changes; unify save/load locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 76fafe584d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- locale: small changes; unify save/load locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
0c9774d934 keybind_setup: resort items as in other menus too; 'save' before 'load'
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 7be9d3a36d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- keybind_setup: resort items as in other menus too; 'save' before 'load'

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
54cd0a93e0 menu: always add an offset to menus; not only in round-border-mode
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: cd5fc80ebe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- menu: always add an offset to menus; not only in round-border-mode

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +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
23713174bc yWeb: align cifs-mounts to new automount-syntax
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- yWeb: align cifs-mounts to new automount-syntax

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
vanhofen
8b96866c78 nhttpd: remove non-working and outdated Y_CONFIG_BUILD_AS_DAEMON switch
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- nhttpd: remove non-working and outdated Y_CONFIG_BUILD_AS_DAEMON switch

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
6164103445 nhttpd: align mod_sendfile.mime_types to HTTPD_SENDFILE_EXT
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- nhttpd: align mod_sendfile.mime_types to HTTPD_SENDFILE_EXT

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


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

Origin message was:
------------------
- nhttpd: fix typo in AUTH_NAME_MSG

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
2ed06b0a6e nhttpd: enable mod_sendfile.sendAll by default
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- nhttpd: enable mod_sendfile.sendAll by default

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
7c822ed2ca y-web: show hostname as page-title
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- y-web: show hostname as page-title

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
481d3d7017 y-web: remove white background from favicon
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5477bed480
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-01 (Fri, 01 Sep 2017)

Origin message was:
------------------
- y-web: remove white background from favicon

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
46cd0fbb5b acinclude.m4: add missing variables substitutions
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 6e158e00ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-31 (Thu, 31 Aug 2017)

Origin message was:
------------------
- acinclude.m4: add missing variables substitutions

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
dd2db83543 locale: small changes in update locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 9112e85cd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-29 (Tue, 29 Aug 2017)

Origin message was:
------------------
- locale: small changes in update locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-14 12:14:41 +02:00
vanhofen
37bbd787dd helpers.chh/h: add some helper functions
Partial cherry pick from:
https://bitbucket.org/neutrino-images/ni-neutrino-hd

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


Origin commit data
------------------
Commit: 43c7e0ed09
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)
2017-09-14 12:14:41 +02:00
Jacek Jendrzej
f598fd51d3 try to fix tm thread
Origin commit data
------------------
Commit: 513850f915
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 12:09:40 +02:00
Jacek Jendrzej
0f9284bf91 src/driver/screenshot.cpp avoid memory ranges overlap
Origin commit data
------------------
Commit: d30bd0ea26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 11:17:36 +02:00
vanhofen
ae184591fb parentallock_setup: fix compiler warning; remove easymenu leftover
Origin commit data
------------------
Commit: 26e8712f90
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- parentallock_setup: fix compiler warning; remove easymenu leftover
2017-09-13 18:44:29 +02:00
vanhofen
8d21a64f35 parentallock_setup: fix compiler warning; remove easymenu leftover
Origin commit data
------------------
Commit: 4c5645fbab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- parentallock_setup: fix compiler warning; remove easymenu leftover
2017-09-13 16:35:52 +02:00
vanhofen
0bc0da5d40 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/mediaplayer.cpp


Origin commit data
------------------
Commit: 626537a35b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 16:31:47 +02:00
Jacek Jendrzej
ecf78ec322 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 98a31ea821
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 15:53:42 +02:00
vanhofen
ea1be5ae2a rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Commit: d23323758c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code
2017-09-13 15:52:19 +02:00
vanhofen
1d02f3d908 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/cam_menu.cpp
	src/gui/info_menue.cpp
	src/gui/mediaplayer.cpp
	src/gui/network_setup.cpp
	src/gui/record_setup.cpp
	src/gui/settings_manager.cpp
	src/gui/update_menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 8d5f5578ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 15:05:33 +02:00
vanhofen
e7f85aba40 rework multimedia-menu code; cleanup from many unused code
Origin commit data
------------------
Commit: 56cdb2dd6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code
2017-09-13 14:46:38 +02:00
Jacek Jendrzej
b9a280c14a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: a5bc9f1050
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 14:09:21 +02:00
Jacek Jendrzej
db4c1d616f fix pick diff error
Origin commit data
------------------
Commit: a7813a885d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 14:08:29 +02:00
Jacek Jendrzej
1e3e303592 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 4e232439c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 13:52:49 +02:00
vanhofen
cca884105b remove unused nkplay stuff
Origin commit data
------------------
Commit: 1fae4130b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
2017-09-13 13:48:16 +02:00
Jacek Jendrzej
c44f82f12a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
2017-09-13 13:40:40 +02:00
vanhofen
6310efb007 remove unused nkplay stuff
Origin commit data
------------------
Commit: 932a535b6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
2017-09-13 13:35:23 +02:00
vanhofen
9db42a7d2b drop easymenu
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
2017-09-13 13:35:23 +02:00
vanhofen
99455725dc remove unused nkplay stuff
Origin commit data
------------------
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
2017-09-13 13:09:34 +02:00
vanhofen
d71095f33b neutrino_menu: re-add accidently removed plugin-items
Origin commit data
------------------
Commit: 1c3f1ed7ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- neutrino_menu: re-add accidently removed plugin-items
2017-09-13 12:50:11 +02:00
vanhofen
2d6e2ab9c1 remove easymenu from config-file
Origin commit data
------------------
Commit: f42b74a317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove easymenu from config-file
2017-09-13 10:45:23 +02:00