Commit Graph

39 Commits

Author SHA1 Message Date
vanhofen
a0cce78210 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/rot.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/status/various/lock.png
	data/pictures/backgrounds/1280x720/shutdown.jpg
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/streamts.cpp
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 74aab8ddd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)



------------------
This commit was generated by Migit
2017-11-28 10:31:10 +01:00
vanhofen
f504430ba9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/locale/english.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.h
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:53:55 +02:00
vanhofen
e143e0bcb0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/0.png
	data/icons/buttons/1.png
	data/icons/buttons/2.png
	data/icons/buttons/3.png
	data/icons/buttons/4.png
	data/icons/buttons/5.png
	data/icons/buttons/6.png
	data/icons/buttons/7.png
	data/icons/buttons/8.png
	data/icons/buttons/9.png
	data/icons/buttons/blau.png
	data/icons/buttons/btn_backward.png
	data/icons/buttons/btn_forward.png
	data/icons/buttons/btn_pause.png
	data/icons/buttons/btn_play.png
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/btn_record_inactive.png
	data/icons/buttons/btn_stop.png
	data/icons/buttons/down.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/help.png
	data/icons/buttons/help_small.png
	data/icons/buttons/home.png
	data/icons/buttons/info.png
	data/icons/buttons/info_small.png
	data/icons/buttons/left.png
	data/icons/buttons/menu.png
	data/icons/buttons/menu_small.png
	data/icons/buttons/mute_small.png
	data/icons/buttons/mute_zap_gray.png
	data/icons/buttons/mute_zap_green.png
	data/icons/buttons/ok.png
	data/icons/buttons/power.png
	data/icons/buttons/right.png
	data/icons/buttons/rot.png
	data/icons/buttons/up.png
	data/icons/filetypes/movie.png
	data/icons/filetypes/mp3.png
	data/icons/headers/audio.png
	data/icons/headers/bookmarkmanager.png
	data/icons/headers/colors.png
	data/icons/headers/error.png
	data/icons/headers/features.png
	data/icons/headers/games.png
	data/icons/headers/icon_blue.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/headers/information.png
	data/icons/headers/keybinding.png
	data/icons/headers/language.png
	data/icons/headers/lcd.png
	data/icons/headers/mainmenue.png
	data/icons/headers/multimedia.png
	data/icons/headers/network.png
	data/icons/headers/personalize.png
	data/icons/headers/shell.png
	data/icons/headers/softupdate.png
	data/icons/headers/streaming.png
	data/icons/headers/timer.png
	data/icons/headers/upnp.png
	data/icons/headers/video.png
	data/icons/movieplayer/mp_b-skip.png
	data/icons/movieplayer/mp_f-skip.png
	data/icons/movieplayer/mp_pause.png
	data/icons/movieplayer/mp_play.png
	data/icons/movieplayer/mp_play_repeat_all.png
	data/icons/movieplayer/mp_play_repeat_track.png
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	data/icons/status/channel/16_9.png
	data/icons/status/channel/16_9_gray.png
	data/icons/status/channel/ca2.png
	data/icons/status/channel/ca2_gray.png
	data/icons/status/channel/dd.png
	data/icons/status/channel/dd_avail.png
	data/icons/status/channel/dd_gray.png
	data/icons/status/channel/radiotextget.png
	data/icons/status/channel/radiotextoff.png
	data/icons/status/channel/radiotextwait.png
	data/icons/status/channel/res_000.png
	data/icons/status/channel/res_1080.png
	data/icons/status/channel/res_1280.png
	data/icons/status/channel/res_1440.png
	data/icons/status/channel/res_1920.png
	data/icons/status/channel/res_288.png
	data/icons/status/channel/res_352.png
	data/icons/status/channel/res_382.png
	data/icons/status/channel/res_480.png
	data/icons/status/channel/res_528.png
	data/icons/status/channel/res_544.png
	data/icons/status/channel/res_576.png
	data/icons/status/channel/res_704.png
	data/icons/status/channel/res_720.png
	data/icons/status/channel/res_hd.png
	data/icons/status/channel/res_sd.png
	data/icons/status/channel/subt.png
	data/icons/status/channel/subt_gray.png
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png
	data/icons/status/channel/vtxt.png
	data/icons/status/channel/vtxt_gray.png
	data/icons/status/various/ats.png
	data/icons/status/various/ats_gray.png
	data/icons/status/various/ca.png
	data/icons/status/various/lock.png
	data/icons/status/various/mounted.png
	data/icons/status/various/mute.png
	data/icons/status/various/not_mounted.png
	data/icons/status/various/pip.png
	data/icons/status/various/rec_event_marker.png
	data/icons/status/various/rec_gray.png
	data/icons/status/various/zap.png
	data/locale/Makefile.am
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/fb_accel_sti.cpp
	src/gui/Makefile.am
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:41:46 +02:00
vanhofen
8563a7bb9b code alignments to master branch
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbb726e191
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)

Origin message was:
------------------
- code alignments to master branch

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

------------------
This commit was generated by Migit
2017-09-21 11:41:59 +02:00
Jacek Jendrzej
e250ac7837 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 13:54:04 +02:00
vanhofen
07923a9799 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
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-09-14 12:14:41 +02:00
vanhofen
022ceb42c9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/plugins.cpp
	src/gui/plugins.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a11e7df409
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)



------------------
This commit was generated by Migit
2017-09-08 12:24:32 +02:00
vanhofen
7f84346b01 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.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f0f0c1f55d
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.


------------------
This commit was generated by Migit
2017-09-08 10:53:03 +02:00
vanhofen
c80102a917 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
2017-02-09 13:19:03 +01:00
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
70cbcb6bb5 replace framebuffer.h include with forward declaration
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)


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



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
3dcee88f80 replace framebuffer.h include with forward declaration
instead of including framebuffer.h almost everywhere, replace it with
class CFrameBuffer forward declarations and/or generic system includes.
Add a hack to define fb_pixel_t to config.h (one reason for
framebuffer.h includes was the fb_pixel_t define)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 63b6efd1f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-05 13:05:07 +01:00
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
Stefan Seyfried
353da08b72 plugins.h: remove unnecessary include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f0e93c215
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)


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

------------------
This commit was generated by Migit
2015-01-02 21:00:07 +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
0907440240 plugins.h: remove unnecessary include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e5a69c37b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)


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

------------------
This commit was generated by Migit
2014-12-25 18:18:01 +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
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
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
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
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
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
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
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
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
Jacek Jendrzej
d6ac9e52c5 never used values
Origin commit data
------------------
Branch: ni/coolstream
Commit: e023548008
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)


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

------------------
This commit was generated by Migit
2012-05-08 15:49:36 +02:00
Thilo Graf
3c8fbd8404 neutrino usermenu plugin: fix plugin call
Plugin call was broken because of a merge error.

add config parameter 'index' and 'key' for plugins
This allows (optional) to config an user definied sort and setup rc-key for plugin via
plugin.cfg.

Sort by filename is still working as before in second instance.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1660 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e6dbbc323f
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-09-02 (Fri, 02 Sep 2011)

Origin message was:
------------------
*neutrino usermenu plugin: fix plugin call

Plugin call was broken because of a merge error.

add config parameter 'index' and 'key' for plugins
This allows (optional) to config an user definied sort and setup rc-key for plugin via
plugin.cfg.

Sort by filename is still working as before in second instance.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1660 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-09-02 17:05:55 +00:00
Thilo Graf
edbf6bca35 neutrino plugin-class: style correcture
add missing constructor

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1363 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 31c42c1106
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-03-31 (Thu, 31 Mar 2011)

Origin message was:
------------------
*neutrino plugin-class: style correcture

add missing constructor

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1363 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-03-31 13:44:45 +00:00
Jacek Jendrzej
c17f47f698 change 'long long' tom int64_t'; change variable buf to new delete;
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f59cc96ec
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-07 (Sun, 07 Feb 2010)



------------------
This commit was generated by Migit
2010-02-07 14:32:21 +00:00
mrcolor
bcecfb6585 our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)



------------------
This commit was generated by Migit
2009-12-08 11:05:11 +00:00