mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,745 Commits 2 Branches 9 Tags
9f3dad285fab0cb15b7f38de369852fe1121d069
Commit Graph

10745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
9f3dad285f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 10:38:14 +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
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
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
68e2832f96 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 16:55:39 +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
Michael Liebmann
71998d0131 osd resolution: Add 'mode' to osd_resolution_struct_t 
- Use COsdSetup::OSDMODE_XXX enums to identify various resolutions


Origin commit data
------------------
Commit: 653e574937
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
c59c3bbdd1 osd resolution: Add src/gui/osd_helpers.cpp 
- Move switch osd resolution from COsdSetup::changeNotify() to
 COsdHelpers::changeOsdResolution()


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

Origin message was:
------------------
osd resolution: Add src/gui/osd_helpers.cpp

 - Move switch osd resolution from COsdSetup::changeNotify() to
  COsdHelpers::changeOsdResolution()
 2017-02-28 15:04:08 +01:00
Michael Liebmann
5173230337 configure: --enable-libcoolstream-static 
--with-libcoolstream-static-dir= for path to static libcoolstream

Example for neutrino.mk:
 N_CONFIG_OPTS += --enable-libcoolstream-static
 # path for static libcoolstream
 N_CONFIG_OPTS += --with-libcoolstream-static-dir="$(TARGETPREFIX)/lib"


Origin commit data
------------------
Commit: 544b8c76b3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-20 (Mon, 20 Feb 2017)

Origin message was:
------------------
configure: --enable-libcoolstream-static

 --with-libcoolstream-static-dir= for path to static libcoolstream

Example for neutrino.mk:
 N_CONFIG_OPTS += --enable-libcoolstream-static
 # path for static libcoolstream
 N_CONFIG_OPTS += --with-libcoolstream-static-dir="$(TARGETPREFIX)/lib"
 2017-02-28 09:56:51 +01:00
vanhofen
a41b057930 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e83babe2c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-27 (Mon, 27 Feb 2017)
 2017-02-27 08:01:20 +01:00
vanhofen
f5bc61cab8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d2b763294e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-27 (Mon, 27 Feb 2017)
 2017-02-27 08:00:34 +01:00
Michael Liebmann
1fe5a6bbd2 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 1fc0186175
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-27 (Mon, 27 Feb 2017)
 2017-02-27 00:24:54 +01:00
Michael Liebmann
4bf399b5b2 CLuaInstance: Add script fumction 'scale2Res' 
- Set Lua api version to 1.69


Origin commit data
------------------
Commit: 6166f4a6f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-27 (Mon, 27 Feb 2017)
 2017-02-27 00:24:34 +01:00
Michael Liebmann
8d22530d1f fb_generic: Add "#define SCALE2RES_DEFINED" to check... 
...presence of 'CFrameBuffer::scale2Res()'

 - Revert this patch when pu/fb-setmode branch is merged to master


Origin commit data
------------------
Commit: 1fea75f428
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-27 (Mon, 27 Feb 2017)
 2017-02-27 00:24:07 +01:00
vanhofen
6556882cb1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: c188cf3683
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
 2017-02-26 22:35:47 +01:00
vanhofen
f37a36da3c Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: db2a8c021b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
 2017-02-26 22:31:51 +01:00
vanhofen
24900dcdf9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 5442173af0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
 2017-02-26 22:31:40 +01:00