Commit Graph

162 Commits

Author SHA1 Message Date
vanhofen
1c1c5a05f3 colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


------------------
This commit was generated by Migit
2016-08-14 21:55:18 +02:00
Jacek Jendrzej
5f8422c29a (performance) Prefer prefix ++/-- operators for non-primitive types
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7db16952f6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-16 13:02:10 +01:00
Michael Liebmann
d4947770df Fix compile neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 821ccf34a5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-12 (Tue, 12 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 07:26:04 +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
eb7788c7a4 neutrino: press tv/radio key to return to plain tv/radio
Origin commit data
------------------
Branch: ni/coolstream
Commit: 736343d35b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- neutrino: press tv/radio key to return to plain tv/radio

------------------
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
Jacek Jendrzej
c30289f3f0 add pugixml
Origin commit data
------------------
Branch: ni/coolstream
Commit: 422c91d117
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-28 10:12:23 +02:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Jacek Jendrzej
4ba11a0db3 xmlinterface use const char instand char
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8227a01592
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-20 (Fri, 20 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-20 12:05:22 +01:00
Jacek Jendrzej
315f5a4b4d prevent possible segfault std::string if value NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40fe7fae34
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-20 (Fri, 20 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-20 11:57:12 +01:00
Stefan Seyfried
896aad4e0a filebrowser, moviebrowser, pictureviewer: clarify error message
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e1678c2a3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-06 (Fri, 06 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-09 13:47:32 +01:00
Stefan Seyfried
1411d19353 filebrowser, moviebrowser, pictureviewer: clarify error message
Origin commit data
------------------
Branch: ni/coolstream
Commit: 678a008310
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-06 (Fri, 06 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-06 17:26:20 +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
TangoCash
cabc52c764 movieplayer: add playlist_manager
NOTE: This is a merge of several patches by TangoCash
 for neutrino-mp aligned to neutrino-hd.
 We use 'play' key to open playlist_manager.


Origin commit data
------------------
Branch: ni/coolstream
Commit: dfc7a1d304
Author: TangoCash <eric@loxat.de>
Date: 2014-11-26 (Wed, 26 Nov 2014)

Origin message was:
------------------
- movieplayer: add playlist_manager

NOTE: This is a merge of several patches by TangoCash
   for neutrino-mp aligned to neutrino-hd.
   We use 'play' key to open playlist_manager.


------------------
This commit was generated by Migit
2014-11-26 10:23:21 +01:00
[CST] Focus
573c8d3636 gui/filebrowser.cpp: cleanup, simplify footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 713820a1c0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-01 17:15:57 +04:00
[CST] Focus
d0ceb98310 gui/filebrowser.cpp: change OK button behavior:
always return marked list, if there are marked files;
always change dir, if there are no marked files;
to recursive add dir, use mark


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c3256bacf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)



------------------
This commit was generated by Migit
2014-09-30 14:07:38 +04:00
[CST] Focus
ba4934300d gui/filebrowser.cpp: change checkBD() to static
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3e57a224d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-27 (Sat, 27 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-27 16:21:43 +04:00
martii
070b342de4 overload access(2)
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81ca577fb8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-30 (Sun, 30 Jun 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
[CST] Focus
0824918f69 gui/movieplayer.cpp: add support for marked file list to play (file playback) and repeat modes,
original code (C) martii <m4rtii@gmx.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d83d519c86
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)



------------------
This commit was generated by Migit
2014-09-17 20:13:49 +04:00
martii
5bb83aadc1 gui/filebrowser: fix page up/down
Conflicts:
	src/gui/filebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f63c3da37c
Author: martii <m4rtii@gmx.de>
Date: 2014-04-09 (Wed, 09 Apr 2014)



------------------
This commit was generated by Migit
2014-09-15 12:48:54 +04:00
martii
9330027e22 gui/filebrowser: rework page-up/-down
Conflicts:
	src/gui/filebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b4ca0290a3
Author: martii <m4rtii@gmx.de>
Date: 2014-03-22 (Sat, 22 Mar 2014)



------------------
This commit was generated by Migit
2014-09-15 12:46:38 +04:00
martii
e227adc879 gui/filebrowser: don't crash when fonts are changed (untested)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 805a1232cf
Author: martii <m4rtii@gmx.de>
Date: 2013-11-26 (Tue, 26 Nov 2013)


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

------------------
This commit was generated by Migit
2014-09-15 12:26:43 +04:00
martii
29d571c988 gui/filebrowser: don't show progressbar unless directories were added
Origin commit data
------------------
Branch: ni/coolstream
Commit: e98336658d
Author: martii <m4rtii@gmx.de>
Date: 2014-08-02 (Sat, 02 Aug 2014)


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

------------------
This commit was generated by Migit
2014-08-26 17:31:28 +04:00
vanhofen
4f9e0ee544 change RenderString() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8

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

------------------
This commit was generated by Migit
2014-06-11 23:07:13 +02:00
vanhofen
108a1c1b93 change getRenderWidth() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8

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

------------------
This commit was generated by Migit
2014-06-11 23:07:00 +02:00
vanhofen
7738ad3855 filebrowser: fix paint of SMSKey in footer and ...
... align both buttonlines in footer to same width


Origin commit data
------------------
Branch: ni/coolstream
Commit: dc39bde14a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-31 (Sat, 31 May 2014)

Origin message was:
------------------
- filebrowser: fix paint of SMSKey in footer and ...

 ... align both buttonlines in footer to same width


------------------
This commit was generated by Migit
2014-05-31 17:54:29 +02:00
vanhofen
e094c23534 filebrowser: paintFoot() at every ChangeDir()
this fixes the empty footer when parentDir was empty


Origin commit data
------------------
Branch: ni/coolstream
Commit: f22a8ee1c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-31 (Sat, 31 May 2014)

Origin message was:
------------------
- filebrowser: paintFoot() at every ChangeDir()

 this fixes the empty footer when parentDir was empty


------------------
This commit was generated by Migit
2014-05-31 15:23:46 +02:00
Stefan Seyfried
ea7cb97893 Merge remote-tracking branch 'check/next-cc'
broken, needs buildfixing


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



------------------
This commit was generated by Migit
2014-02-23 15:17:48 +01:00
[CST] Focus
74471cb481 gui/filebrowser.cpp: return directory in player mode (Hide_records is true)
if BDMV/index.bdmv found in dir


Origin commit data
------------------
Branch: ni/coolstream
Commit: 628de1f68c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)



------------------
This commit was generated by Migit
2014-02-21 20:01:14 +04:00
Stefan Seyfried
de371a25e8 Merge remote-tracking branch 'check/next-cc-fixed'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 78f51baf66
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-26 00:33:08 +01:00
Thilo Graf
9585b49365 CComponentsHeader: rework constructors, add CComponentsHeaderLocalized
Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ea7ec48df
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
CComponentsHeader: rework constructors, add CComponentsHeaderLocalized

Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


------------------
This commit was generated by Migit
2014-01-24 23:09:56 +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
vanhofen
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp

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

------------------
This commit was generated by Migit
2014-01-22 12:37:21 +01:00
Stefan Seyfried
003773490b Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-05 18:31:31 +01:00
martii
2be78acdd2 gui/filebrowser: don't segv when removing files with small names
Origin commit data
------------------
Branch: ni/coolstream
Commit: f953cd07b3
Author: martii <m4rtii@gmx.de>
Date: 2014-01-04 (Sat, 04 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-04 14:25:54 +01:00
Stefan Seyfried
0c4ecc191a Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-29 22:12:09 +01:00
martii
b07bfe5159 gui/filebrowser: SMS input: fix RC_7, rewrite handler
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8baab17dda
Author: martii <m4rtii@gmx.de>
Date: 2013-12-26 (Thu, 26 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-26 13:35:01 +01:00
Stefan Seyfried
6fae9a0db4 Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing


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



------------------
This commit was generated by Migit
2013-12-22 21:25:05 +01:00
[CST] Focus
00fd51db7a gui/filebrowser.cpp: fix color for marked files;
do not add selected file on OK press, if there are marked files


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8358e5921e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)



------------------
This commit was generated by Migit
2013-12-15 14:40:55 +04:00
[CST] Focus
f6a2caa68c gui/filebrowser.cpp: add AAC file type
Origin commit data
------------------
Branch: ni/coolstream
Commit: d69f8d507a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-15 14:40:54 +04:00
martii
7c4d89cf40 drop #ifdef ENABLE_FLAC
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf694d32f1
Author: martii <m4rtii@gmx.de>
Date: 2013-10-31 (Thu, 31 Oct 2013)


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

------------------
This commit was generated by Migit
2013-12-15 14:40:54 +04:00
vanhofen
3498b687da Revert "- add missing include of vfd header"
This reverts commit 3006c5ff4b.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:39:55 +01:00
vanhofen
3006c5ff4b add missing include of vfd header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)

Origin message was:
------------------
- add missing include of vfd header

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

------------------
This commit was generated by Migit
2013-11-13 10:40:18 +01:00
Stefan Seyfried
b0077cafc5 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
2013-11-10 16:55:53 +01:00
Thilo Graf
cbc2b193af CComponents: add unfied header file for general include of cc classes
Provides a unified header file, so it is not required to select a
certain header file.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f7798affc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)



------------------
This commit was generated by Migit
2013-10-24 21:19:07 +02: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
Jacek Jendrzej
07ccabf7c3 CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f07cbe3dd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)

Origin message was:
------------------
CUpdateSettings:: allow choose tmp(ramfs,TMPFS_MAGIC) as update dir

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

------------------
This commit was generated by Migit
2013-10-08 10:10:10 +02:00