Commit Graph

74 Commits

Author SHA1 Message Date
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Michael Liebmann
b46710d6a8 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: db8a9e6388
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-25 13:20:10 +01:00
vanhofen
eeb5987454 plugins: startPlugin works with filename; just for clarity
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55f0ab75af
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)

Origin message was:
------------------
- plugins: startPlugin works with filename; just for clarity

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-24 21:29:31 +01:00
vanhofen
8e5d36fe25 plugins: fix movieplayer-plugin
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbd88cd051
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)

Origin message was:
------------------
- plugins: fix movieplayer-plugin

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-24 21:28:37 +01:00
Stefan Seyfried
6ac7d5a087 Merge remote-tracking branch 'cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b53fbaf327
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-08 (Fri, 08 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-08 19:52:41 +01:00
Thilo Graf
70fa034418 CPlugins: try to fix possible segfault while open shellwindow scripts
Origin commit data
------------------
Branch: ni/coolstream
Commit: f54f1d0805
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-02 00:10:20 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
Michael Liebmann
0ca4e1e737 CLuaInstance: Move luainstance into a separate directory (src/gui/lua)
- Move video functions from luainstance.cpp to lua_video.cpp
 - For the future, provided the individual classes
 (eg menu, CComponents etc.) to move in separate files.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 464f929437
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)

Origin message was:
------------------
CLuaInstance: Move luainstance into a separate directory (src/gui/lua)

 - Move video functions from luainstance.cpp to lua_video.cpp
 - For the future, provided the individual classes
  (eg menu, CComponents etc.) to move in separate files.


------------------
This commit was generated by Migit
2015-12-08 12:01:25 +01:00
vanhofen
c095a9cbd5 move PLUGINDIR_VAR to global.h to avoid some hardcoded paths
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e6d7ad765
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- move PLUGINDIR_VAR to global.h to avoid some hardcoded paths

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-06 22:58:54 +02:00
vanhofen
f884fa061b plugins: replace PLUGINDIR_USB with PLUGINDIR_MNT (/mnt/plugins)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75f84739a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-05 (Tue, 05 May 2015)

Origin message was:
------------------
- plugins: replace PLUGINDIR_USB with PLUGINDIR_MNT (/mnt/plugins)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-05 14:46:46 +02:00
vanhofen
ff019d0d5f plugins: add GAMESDIR (/var/tuxbox/games) to plugin list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14dc610a68
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-05 (Tue, 05 May 2015)

Origin message was:
------------------
- plugins: add GAMESDIR (/var/tuxbox/games) to plugin list

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-05 14:45:28 +02:00
Stefan Seyfried
499659677f Merge remote-tracking branch 'test/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-07 20:09:44 +01:00
vanhofen
49bafba0e5 plugins: allow localization in plugin.cfg
Example:
name=Default plugin name
description=Default plugin desription
name.deutsch=Deutscher Plugin-Name
name.english=English plugin name


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4baeab4353
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-03-05 (Thu, 05 Mar 2015)

Origin message was:
------------------
- plugins: allow localization in plugin.cfg

Example:
name=Default plugin name
description=Default plugin desription
name.deutsch=Deutscher Plugin-Name
name.english=English plugin name


------------------
This commit was generated by Migit
2015-03-05 17:03:21 +01:00
Stefan Seyfried
08f96ff53a disarm broken HAVE_SPARK_HARDWARE code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bff1ff02d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-27 10:59:04 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
vanhofen
83da02e397 Revert "- plugins: allow empty menu hints"
This reverts commit b8ed0c1980
because 809344dadf do the same.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a401a46b3
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-22 (Sat, 22 Nov 2014)



------------------
This commit was generated by Migit
2014-11-22 16:17:30 +01:00
vanhofen
d7e583f7c8 plugins: Fix assignment of prefered keys
New keyword in plugin.cfg: key=<key>
* key=red
* key=green
* key=yellow
* key=blue
* key=auto

If entry is missing key is auto-assigned


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0a0cdb221
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- plugins: Fix assignment of prefered keys

New keyword in plugin.cfg: key=<key>
* key=red
* key=green
* key=yellow
* key=blue
* key=auto

If entry is missing key is auto-assigned


------------------
This commit was generated by Migit
2014-11-07 12:17:29 +01:00
vanhofen
b8ed0c1980 plugins: allow empty menu hints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 95eab2a48d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)

Origin message was:
------------------
- plugins: allow empty menu hints

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-06 12:36:07 +01:00
vanhofen
32d044e54b plugins: disable unused cfg-params
Origin commit data
------------------
Branch: ni/coolstream
Commit: c8522bae71
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)

Origin message was:
------------------
- plugins: disable unused cfg-params

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-06 12:36:07 +01:00
vanhofen
6c58364cd5 plugins: add and use default hint icon; THX to fred_feuerstein
Origin commit data
------------------
Branch: ni/coolstream
Commit: 765ad18b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-08 (Wed, 08 Oct 2014)

Origin message was:
------------------
- plugins: add and use default hint icon; THX to fred_feuerstein

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-10-08 14:14:24 +04:00
vanhofen
65aa4db37b plugins: allow hinticons for plugins
Default is <plugin>_hint.png; an entry 'hinticon=another_name' in
<plugin>.cfg overrides this; use icon in plugindir first; if not found
use icon in one of the other wellknown neutrino icon directories.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ebbed374af
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-06 (Mon, 06 Oct 2014)

Origin message was:
------------------
- plugins: allow hinticons for plugins

Default is <plugin>_hint.png; an entry 'hinticon=another_name' in
<plugin>.cfg overrides this; use icon in plugindir first; if not found
use icon in one of the other wellknown neutrino icon directories.


------------------
This commit was generated by Migit
2014-10-07 13:19:15 +04:00
vanhofen
64d36e75b7 plugins: add new configuration item 'integration'
Integrate plugins in existing neutrino menues. Usage in plugin.cfg:
 integration=0; disabled
 integration=1; reserved
 integration=2; multimedia menu
 integration=3; settings menu
 integration=4; service menu
 integration=5; information menu


Origin commit data
------------------
Branch: ni/coolstream
Commit: f586552719
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-28 (Sun, 28 Sep 2014)

Origin message was:
------------------
- plugins: add new configuration item 'integration'

Integrate plugins in existing neutrino menues. Usage in plugin.cfg:
 integration=0; disabled
 integration=1; reserved
 integration=2; multimedia menu
 integration=3; settings menu
 integration=4; service menu
 integration=5; information menu


------------------
This commit was generated by Migit
2014-09-29 14:38:39 +04:00
vanhofen
ceb3ca7c6f plugins: add configparam 'shellwindow'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b46ad0c5ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-17 (Wed, 17 Sep 2014)

Origin message was:
------------------
- plugins: add configparam 'shellwindow'

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-17 18:04:54 +02:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
martii
de1fdddf3a gui/plugins: exclude unused methods
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7ebf966c4
Author: martii <m4rtii@gmx.de>
Date: 2014-05-31 (Sat, 31 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-31 12:10:54 +02:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
vanhofen
de9d9c0e5d plugins: cleanup
* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b5242c254
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-02 (Sun, 02 Mar 2014)

Origin message was:
------------------
- plugins: cleanup

* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin


------------------
This commit was generated by Migit
2014-03-02 00:43:59 +01:00
Stefan Seyfried
5c15a5ef26 add virtual plugin type 'not game'
the only maybe useful distinction between plugin types
is game / others, so add a 'virtual' plugin type which
represents everything but games


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44cd36c412
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-16 (Sun, 16 Feb 2014)



------------------
This commit was generated by Migit
2014-02-16 18:29:23 +01:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
vanhofen
b00e109f84 plugins: type for listed plugins on blue key is selectable
* add mainmenu items for tools and lua-extensions
 (default not visible)
* add usermenu items for tools and lua-extensions
 (default off)


Origin commit data
------------------
Branch: ni/coolstream
Commit: f9ad30f183
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-02-04 (Tue, 04 Feb 2014)

Origin message was:
------------------
- plugins: type for listed plugins on blue key is selectable

* add mainmenu items for tools and lua-extensions
 (default not visible)
* add usermenu items for tools and lua-extensions
 (default off)


------------------
This commit was generated by Migit
2014-02-04 09:08:21 +01:00
Stefan Seyfried
12041ff30b Revert "Add a --enable-lua switch to enable LUA support"
This reverts commit c980278eb1.

This just makes the code unreadable and why would one build
without lua :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5525e9f4b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:11:03 +01:00
Stefan Seyfried
b7c804fc22 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
Michael Liebmann
c980278eb1 Add a --enable-lua switch to enable LUA support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82d4832013
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-21 17:05:24 +01:00
Stefan Seyfried
cef20d5284 luainstance: the name is "Lua", not "LUA"
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d7e07f81f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-18 (Mon, 18 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-19 20:57:35 +01:00
Stefan Seyfried
88c69c92bd neutrino: add a prototype of a lua plugin interface
this is just for preliminary tests, not yet really usable
for anything useful


Origin commit data
------------------
Branch: ni/coolstream
Commit: f26357e887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-17 (Sun, 17 Mar 2013)



------------------
This commit was generated by Migit
2014-01-19 20:57:35 +01:00
Stefan Seyfried
971d575b78 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
Thilo Graf
764d2d2000 CPlugins: remove dub included header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bc7a6efca
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-04 (Wed, 04 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-04 09:59:09 +02:00
Stefan Seyfried
191ef7d766 luainstance: the name is "Lua", not "LUA"
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6593e3b991
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-18 (Mon, 18 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-18 16:10:01 +01:00
Stefan Seyfried
1f3cbe691b neutrino: add a prototype of a lua plugin interface
this is just for preliminary tests, not yet really usable
for anything useful


Origin commit data
------------------
Branch: ni/coolstream
Commit: da358e7502
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-17 (Sun, 17 Mar 2013)



------------------
This commit was generated by Migit
2013-03-17 23:24:45 +01:00
Stefan Seyfried
767be83e22 helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)



------------------
This commit was generated by Migit
2013-03-05 11:58:49 +01:00
Stefan Seyfried
4324865fb6 helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)



------------------
This commit was generated by Migit
2013-03-03 19:18:13 +01:00
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +01:00
Jacek Jendrzej
93441eaf76 src/gui/plugins.cpp: fix sort pluins without index
Origin commit data
------------------
Branch: ni/coolstream
Commit: 882a7b2e47
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-12-04 19:57:02 +01:00
Stefan Seyfried
a603ec74af Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
2012-10-14 12:51:07 +02:00
Jacek Jendrzej
37d588eb51 Zombie Killer ;)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 768a064629
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-20 (Thu, 20 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-20 22:43:00 +02:00
Stefan Seyfried
9eaeb2866d Merge branch 'neutrino-hd-tripledragon' into neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e46d81b88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-15 (Sat, 15 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-15 12:14:33 +02:00
Jacek Jendrzej
7e4fd63bf2 add wakeup_hdd & file_exists to system-helpers
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6ae7255ac
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)

Origin message was:
------------------
-add wakeup_hdd & file_exists to system-helpers

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-11 20:35:47 +02:00
FlatTV
8b921ac043 Add global helpers my_system() and my_popen()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b92660259c
Author: FlatTV <FlatTV@gmx.de>
Date: 2012-08-30 (Thu, 30 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-08-30 09:28:54 +02:00