Commit Graph

99 Commits

Author SHA1 Message Date
vanhofen
5b8e0f426e user-menu: add audio fileplay item
Conflicts:
	src/gui/user_menue_setup.cpp
	src/system/settings.h

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb2d6f95e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- user-menu: add audio fileplay item

 Conflicts:
	src/gui/user_menue_setup.cpp
	src/system/settings.h

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


------------------
This commit was generated by Migit
2017-12-21 11:28:32 +01:00
vanhofen
c0945a5dbf usermenu: cleanup from ITEM_RASS
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb56689b0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- usermenu: cleanup from ITEM_RASS

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


------------------
This commit was generated by Migit
2017-12-01 14:26:39 +01:00
vanhofen
eeb21f6510 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fc3e793a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01: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
Jacek Jendrzej
c751391c58 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed416416cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-14 (Mon, 14 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-14 16:26:49 +02:00
vanhofen
e8711e0475 Revert "neutrino: disable some menus in upnp & ts mode"
This reverts commit aaee0baf07.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 944ad7cb63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)



------------------
This commit was generated by Migit
2017-08-12 14:05:17 +02:00
Jacek Jendrzej
4052e6868c Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-08 20:06:40 +02:00
GetAway
aaee0baf07 neutrino: disable some menus in upnp & ts mode
to prevent inoperability of neutrino


Origin commit data
------------------
Branch: ni/coolstream
Commit: 90de51de38
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)



------------------
This commit was generated by Migit
2017-08-07 07:52:41 +02:00
Stefan Seyfried
a5cbcf84af Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-04 19:32:30 +01:00
vanhofen
c1140e0c1c rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-03-01 13:03:50 +01:00
Stefan Seyfried
d6861c1054 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-22 22:59:39 +01:00
vanhofen
3706c9177d usermenu: add brackets to code; fix compilation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dcaad4f07
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)

Origin message was:
------------------
- usermenu: add brackets to code; fix compilation

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

------------------
This commit was generated by Migit
2016-12-13 12:32:00 +01:00
vanhofen
0caf40d664 usermenu: sort/cleanup code by items; just code cosmetics
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0f860664c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)

Origin message was:
------------------
- usermenu: sort/cleanup code by items; just code cosmetics

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

------------------
This commit was generated by Migit
2016-12-13 10:53:24 +01:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
Jacek Jendrzej
ea6d4ee461 src/gui/user_menue.cpp fix AddressSanitizer: heap-use-after-free
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4947a71782
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-06 (Sun, 06 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-06 13:15:36 +01:00
vanhofen
6160cf9291 adzap: call adzap directly from usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b0996e3d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: call adzap directly from usermenu

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

------------------
This commit was generated by Migit
2016-03-03 11:18:15 +01:00
vanhofen
550709de5e adzap: add hint icon by fred_feuerstein
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1df41008a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: add hint icon by fred_feuerstein

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

------------------
This commit was generated by Migit
2016-03-03 11:18:15 +01:00
vanhofen
f277c6d889 adzap: align locale in usermenu item to adzap active status
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1dfc1bc452
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: align locale in usermenu item to adzap active status

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

------------------
This commit was generated by Migit
2016-03-03 11:18:15 +01:00
martii
155c0ba036 adzap: port code from martiis-neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: c015d4670f
Author: martii <m4rtii@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- adzap: port code from martiis-neutrino-mp

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

------------------
This commit was generated by Migit
2016-03-03 11:18:14 +01:00
vanhofen
5e8cccbe23 user_menu: get resolution value for livestreams
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a9bee721d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- user_menu: get resolution value for livestreams

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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
vanhofen
fe7c215286 infoviewer_bb: show resolution in livestream mode on color button
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07b1f6f849
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- infoviewer_bb: show resolution in livestream mode on color button

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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Michael Liebmann
4f41565587 movieplayer: Use Lua scripts for selecting live stream urls
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4a2856e1c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Thilo Graf
112207f338 Infoclock: unify handling in some classes with singleton
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59d9b7068e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-29 08:05:05 +01:00
vanhofen
8e70d9fe7e infoviewer: fix audio description in mode_webtv
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32c28038a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-26 (Tue, 26 Jan 2016)

Origin message was:
------------------
- infoviewer: fix audio description in mode_webtv

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

------------------
This commit was generated by Migit
2016-01-26 00:57:08 +01:00
Stefan Seyfried
50cb7dd5d3 Merge remote-tracking branch 'n/cst-next-fixed'
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5c72d35c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-24 13:15:43 +01:00
vanhofen
fd0317a21a rc_lock: rework class; switch to singleton; add icon; vfd-support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eb0aed5db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-20 (Wed, 20 Jan 2016)

Origin message was:
------------------
- rc_lock: rework class; switch to singleton; add icon; vfd-support

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

------------------
This commit was generated by Migit
2016-01-20 20:26:52 +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
vanhofen
d8269b9be5 locale: add usermenu title locales ...
some small reworks; cleanup from #if 0'ed code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5860045999
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)

Origin message was:
------------------
- locale: add usermenu title locales ...

 some small reworks; cleanup from #if 0'ed code


------------------
This commit was generated by Migit
2016-01-02 12:18:06 +01:00
Stefan Seyfried
a28613ab99 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-01 14:10:48 +01:00
vanhofen
935e0ece89 user_menu: allow controlable return_title value
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9325385ce9
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)

Origin message was:
------------------
- user_menu: allow controlable return_title value

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

------------------
This commit was generated by Migit
2015-12-29 14:31:51 +01:00
Stefan Seyfried
0a95a07654 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-28 16:15:14 +01:00
Thilo Graf
6b38f03efe CUserMenu: using native callback to ensure paint for info clock after hide of this menu window
menu->hide() handler comes too early, nice to see if clock is transparent.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 42102d432d
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)



------------------
This commit was generated by Migit
2015-12-27 14:42:29 +01:00
Stefan Seyfried
5b0debf29a Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-15 17:29:18 +01:00
vanhofen
5033776bdd user_menue: disable some items in movieplayer mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e1f5bc9e
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- user_menue: disable some items in movieplayer mode

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

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +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
vanhofen
32365276ef remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.


------------------
This commit was generated by Migit
2015-04-24 09:11:04 +02:00
Stefan Seyfried
f5d3bb2d9f Merge remote-tracking branch 'check/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22dd798325
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-25 21:20:22 +01:00
[CST] Focus
f62fbd7b50 fix crash in user_menue when ITEM_EPG_MISC is selected
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24c4f5c0cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-25 (Wed, 25 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-25 17:03:14 +01:00
Stefan Seyfried
34024351ba neutrino.h: use forward declaration instead of includes
this reduces the dependency chain on partial rebuilds considerably


Origin commit data
------------------
Branch: ni/coolstream
Commit: b3bfb361f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)



------------------
This commit was generated by Migit
2015-02-14 14:31:12 +01:00
Stefan Seyfried
b0e9dfa0ff neutrino.h: use forward declaration instead of includes
this reduces the dependency chain on partial rebuilds considerably


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7bad347d7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)



------------------
This commit was generated by Migit
2015-02-11 08:22:36 +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
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
Jacek Jendrzej
5288c70665 neutrino use check empty() instead of length() or size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-03 17:51:08 +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
b976eb95c9 plugins: simplify integratePlugins(); ...
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


Origin commit data
------------------
Branch: ni/coolstream
Commit: 389c4c232f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-10 (Mon, 10 Nov 2014)

Origin message was:
------------------
- plugins: simplify integratePlugins(); ...

* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


------------------
This commit was generated by Migit
2014-11-10 22:41:08 +01:00
vanhofen
d27045664b user_menue: minor optimizations
Origin commit data
------------------
Branch: ni/coolstream
Commit: 348add4acd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: minor optimizations

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

------------------
This commit was generated by Migit
2014-11-07 15:39:53 +01:00
vanhofen
f7de4d583e user_menue: fix wrong changes in ec6cb635c0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ec409b264
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: fix wrong changes in ec6cb635c0

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

------------------
This commit was generated by Migit
2014-11-07 13:55:05 +01:00
vanhofen
ec6cb635c0 user_menue: allow colored keys from plugin.cfg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19f7e04c77
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: allow colored keys from plugin.cfg

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

------------------
This commit was generated by Migit
2014-11-07 12:20:47 +01:00