Commit Graph

9925 Commits

Author SHA1 Message Date
Jacek Jendrzej
c2c603b7bc src/zapit/src/zapit.cpp fix segfault without services.xml
Origin commit data
------------------
Commit: bc188c66ba
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-05 (Sun, 05 Mar 2017)
2017-03-05 13:48:40 +01:00
vanhofen
c570c70958 imageinfo_ni: simplify max_bit handling
Conflicts:
	src/gui/imageinfo_ni.cpp


Origin commit data
------------------
Commit: a333845440
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: simplify max_bit handling

Conflicts:
	src/gui/imageinfo_ni.cpp
2017-03-04 00:37:20 +01:00
vanhofen
0aac919b94 imageinfo_ni: small offset corrections and cleanups
Origin commit data
------------------
Commit: 47b98e5879
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: small offset corrections and cleanups
2017-03-03 23:33:41 +01:00
vanhofen
331ac05e51 imageinfo_ni: cleanup info_items struct; ...
remove obsolete videoDecoder calls


Origin commit data
------------------
Commit: 6039c66423
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: cleanup info_items struct; ...

remove obsolete videoDecoder calls
2017-03-03 19:00:40 +01:00
vanhofen
42c56bbdaa imageinfo_ni: use OFFSET-defines; auto-calc info_items struct
Origin commit data
------------------
Commit: c75624cdad
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: use OFFSET-defines; auto-calc info_items struct
2017-03-03 19:00:40 +01:00
vanhofen
35be383b8a imageinfo_ni: avoid multiple cs_get_revision() calls; ...
fix small typo


Origin commit data
------------------
Commit: 1100110913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: avoid multiple cs_get_revision() calls; ...

fix small typo
2017-03-03 19:00:39 +01:00
vanhofen
c88b0d0c19 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: b5de81c184
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 15:51:51 +01:00
vanhofen
308f172cef Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: cca2c6ba74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 15:51:27 +01:00
vanhofen
4819c8ac41 imageinfo: remove obsolete define
Origin commit data
------------------
Commit: b283128d0f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo: remove obsolete define
2017-03-03 15:50:47 +01:00
vanhofen
3710a10921 imageinfo: change handling of yWeb version; use own CConfigFile
Origin commit data
------------------
Commit: 629f91e229
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo: change handling of yWeb version; use own CConfigFile
2017-03-03 15:48:31 +01:00
vanhofen
44cb896f1f imageinfo_ni: add yWeb version
Origin commit data
------------------
Commit: 227f5cbfff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: add yWeb version
2017-03-03 15:39:42 +01:00
vanhofen
5a751edef7 imageinfo_ni: add Lua-API version
Origin commit data
------------------
Commit: 49783579a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- imageinfo_ni: add Lua-API version
2017-03-03 15:39:42 +01:00
Michael Liebmann
4fae2b2c9a Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 487b69b1d4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 14:41:57 +01:00
Michael Liebmann
63ad67a945 CScanTs::handleMsg: Fix handling left/right keys during channel search
Origin commit data
------------------
Commit: c9242679a0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 14:41:26 +01:00
vanhofen
71d742e126 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: b47a570fd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 10:34:35 +01:00
vanhofen
f4b12d1fcc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 0074876592
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 10:34:24 +01:00
vanhofen
1bf92d5fdd fix funny typo
Origin commit data
------------------
Commit: 8862ef621b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- fix funny typo
2017-03-03 09:52:57 +01:00
Thilo Graf
1481a5e2bc CProgressWindow: small optimize of size handling
Origin commit data
------------------
Commit: a9a09541e0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 09:22:08 +01:00
Thilo Graf
ff4dae4c43 CTestMenu: adaopt progress sample with discret percental window dimensions
Origin commit data
------------------
Commit: 4d50172fbd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 09:22:08 +01:00
Thilo Graf
e64a61b8b4 CProgressWindow: adaopt for discret percental window dimensions
Origin commit data
------------------
Commit: 88f80053d2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 09:22:08 +01:00
Thilo Graf
263bd0e3fc CMovieBrowser: adaopt for discret percental window dimensions
Origin commit data
------------------
Commit: 21b700879e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 09:22:08 +01:00
Thilo Graf
3cdfcf3cba CBuildInfo: adaopt for discret percental window dimensions
Origin commit data
------------------
Commit: 449901f1d8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 09:22:08 +01:00
Thilo Graf
8effbfe1cf CComponentsWindow: use negative values for discret percental dimensions
Also add possibility to use placeholder for better readability and
better compatibilty with previous implementations.
See doc in source files for more details


Origin commit data
------------------
Commit: cf9a953b59
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 09:22:08 +01:00
Michael Liebmann
845326aa07 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 3891789be8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 09:10:21 +01:00
vanhofen
00d53e03c9 luainstance: re-add typo TO_WIDE to stay backward compatible
Origin commit data
------------------
Commit: 75ff8687dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- luainstance: re-add typo TO_WIDE to stay backward compatible
2017-03-03 08:57:42 +01:00
vanhofen
42131fe351 luainstance: add missing RADIUS_NONE; fix typo in dynfont handling
Origin commit data
------------------
Commit: 6afe247bc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)

Origin message was:
------------------
- luainstance: add missing RADIUS_NONE; fix typo in dynfont handling
2017-03-03 08:55:35 +01:00
vanhofen
b508879516 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 91fbed7586
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 00:07:20 +01:00
vanhofen
f7bffbff09 Revert "- fix segfault at startup"
This reverts commit b6164c20b7.


Origin commit data
------------------
Commit: 8bd88c94af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
2017-03-03 00:07:10 +01:00
Michael Liebmann
3a8adb94f0 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 6c3b5dcd93
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
2017-03-02 23:38:19 +01:00
Michael Liebmann
0cdafc7a1e CNeutrinoApp::loadSetup: Fix Segfault when an remote timer is defined
Origin commit data
------------------
Commit: 9fe20399c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
2017-03-02 23:37:41 +01:00
vanhofen
55b63d5299 luainstance: add offsets to lua; set Lua api version to 1.70
Origin commit data
------------------
Commit: 6eb1bb1ea4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-02 (Thu, 02 Mar 2017)

Origin message was:
------------------
- luainstance: add offsets to lua; set Lua api version to 1.70
2017-03-02 23:00:49 +01:00
vanhofen
b6164c20b7 fix segfault at startup
Origin commit data
------------------
Commit: 0e2a405fa5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-02 (Thu, 02 Mar 2017)

Origin message was:
------------------
- fix segfault at startup
2017-03-02 22:23:32 +01:00
vanhofen
e714a2ae52 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
2017-03-01 18:18:07 +01:00
vanhofen
9d0dd14108 update: rename DEBUG1 to DRYRUN
Origin commit data
------------------
Commit: 00d2d557c2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- update: rename DEBUG1 to DRYRUN
2017-03-01 18:16:09 +01:00
vanhofen
b95f60030e update: small cleanup; ...
remove obsolete g_Locale->getText() from ShowHint calls


Origin commit data
------------------
Commit: ea3ab21bb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- update: small cleanup; ...

remove obsolete g_Locale->getText() from ShowHint calls
2017-03-01 18:16:09 +01:00
vanhofen
49a0062588 update: change filetype comparsion; "< '3'" to "<= '2'"
Origin commit data
------------------
Commit: 2a9b39f45f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- update: change filetype comparsion; "< '3'" to "<= '2'"
2017-03-01 18:16:09 +01:00
vanhofen
9591b9a0fc update: prepare for menu hints
Origin commit data
------------------
Commit: 943c03fc52
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- update: prepare for menu hints
2017-03-01 18:16:09 +01:00
vanhofen
66b44f2a0f flashtool: localize getType() function
Origin commit data
------------------
Commit: 950f74dd41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- flashtool: localize getType() function
2017-03-01 18:16:09 +01:00
TangoCash
900748ae27 fix blinking clock in some modes (thx dbo)
Origin commit data
------------------
Commit: 16537620a6
Author: TangoCash <eric@loxat.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
2017-03-01 18:16:09 +01:00
Jacek Jendrzej
7c0dde29d3 src/neutrino.cpp init struct timer_remotebox_item, avoid segfault without InfoClock
Origin commit data
------------------
Commit: d12ea80c5b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
2017-03-01 15:04:10 +01:00
vanhofen
55cf6232f7 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ff63cbd6b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
2017-03-01 13:10:09 +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
8e36032281 yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
Origin commit data
------------------
Commit: 5edc857122
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
2017-03-01 11:51:25 +01:00
Michael Liebmann
910c599447 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 02e5c9cbf4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 23:32:20 +01:00
Michael Liebmann
d3ebbd72b9 lua cwindow.new: Fix draw small windows
- Ignore percent conversion of width and height
 to remain compatible with the Lua API


Origin commit data
------------------
Commit: 2d30ef10d8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)

Origin message was:
------------------
lua cwindow.new: Fix draw small windows

 - Ignore percent conversion of width and height
  to remain compatible with the Lua API
2017-02-28 23:31:58 +01:00
vanhofen
f5d9d25957 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 15:36:23 +01:00
Michael Liebmann
84759d6c05 osd resolution: Use COsdHelpers::changeOsdResolution() to adjust...
...OSD resolution after switching video format


Origin commit data
------------------
Commit: ff11dd44ab
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 15:04:09 +01:00
Michael Liebmann
e981a3331a NeutrinoMessages: Add EVT_AUTO_SET_VIDEOSYSTEM
Origin commit data
------------------
Commit: 3bf32265c1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 15:04:09 +01:00
Michael Liebmann
f74929b4ba CInfoViewer::showTitle: Add parameter forcePaintButtonBar
Origin commit data
------------------
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 15:04:09 +01:00