Commit Graph

182 Commits

Author SHA1 Message Date
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
Thilo Graf
aff6a3985b CBouquetList: use required type
fix some possible compiler warnings


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



------------------
This commit was generated by Migit
2013-10-02 10:07:34 +02:00
Stefan Seyfried
c4c20a0790 remove all fb->blit() calls
TODO: check if plugins etc. need extra treatment


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ffa2155
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)



------------------
This commit was generated by Migit
2013-09-28 13:01:03 +02:00
[CST] Focus
e07df00083 src/gui/bouquetlist.cpp: do not add dublicate channels while copy bouquet to favorite,
if favorite bouquet already exist


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



------------------
This commit was generated by Migit
2013-09-25 17:08:34 +04:00
[CST] Focus
66c5c51b0e channel list: restrict adding channels to favorits only,
show empty bouquets only in channel add mode


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



------------------
This commit was generated by Migit
2013-09-18 12:57:56 +04:00
Stefan Seyfried
2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.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/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
Michael Liebmann
221b6ee8b4 Replace color indexes of the text colors by real color values for RenderString()
- If necessary, Correct data types of the color values


Origin commit data
------------------
Branch: ni/coolstream
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)



------------------
This commit was generated by Migit
2013-07-21 22:00:58 +02:00
Stefan Seyfried
4c3c21152b Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
2013-06-16 21:22:14 +02:00
Stefan Seyfried
5f1b5fbdcb neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: a33086568b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)


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

------------------
This commit was generated by Migit
2013-05-30 11:19:39 +02:00
Stefan Seyfried
29fd5bcdcd neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a48922350
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)


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

------------------
This commit was generated by Migit
2013-05-29 15:33:21 +02:00
vanhofen
fb308c6334 neutrino: don't save screen while paint headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c41ffbe47
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-28 (Tue, 28 May 2013)

Origin message was:
------------------
- neutrino: don't save screen while paint headers

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

------------------
This commit was generated by Migit
2013-05-28 10:42:39 +02:00
vanhofen
e52b01ab39 bookmarkmanager/bouquetlist: add missing includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2204631859
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-27 (Mon, 27 May 2013)

Origin message was:
------------------
- bookmarkmanager/bouquetlist: add missing includes

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

------------------
This commit was generated by Migit
2013-05-27 22:08:24 +02:00
vanhofen
c2908f353c bouquetlist: using CComponentsHeader to paint header
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9012e4699
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-27 (Mon, 27 May 2013)

Origin message was:
------------------
- bouquetlist: using CComponentsHeader to paint header

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

------------------
This commit was generated by Migit
2013-05-27 21:19:23 +02:00
Stefan Seyfried
00cfd31e82 neutrino: explicitly include vfd/lcd header
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)



------------------
This commit was generated by Migit
2013-05-11 17:17:33 +02:00
Stefan Seyfried
083bc55347 Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
Stefan Seyfried
89d3d162ea neutrino: make g_channel_list_changed private
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.


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



------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
d241584369 neutrino: make g_channel_list_changed private
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 744ed878de
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
2013-04-14 19:42:28 +02:00
Stefan Seyfried
7254e280e3 Merge branch 'check/pu-cc' into master
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 11:21:55 +02:00
Stefan Seyfried
42e163074f neutrino: make button bar use available space intelligently
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp


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



------------------
This commit was generated by Migit
2013-04-05 14:50:28 +04:00
vanhofen
45e687fa38 bouquetlist.cpp: use existing loop to calc max height of buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc614004cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-21 (Thu, 21 Mar 2013)

Origin message was:
------------------
- bouquetlist.cpp: use existing loop to calc max height of buttons

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

------------------
This commit was generated by Migit
2013-04-01 15:10:01 +04:00
vanhofen
96e02976c6 bouquetlist.cpp: use existing loop to calc max height of buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92f11c1e62
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-21 (Thu, 21 Mar 2013)

Origin message was:
------------------
- bouquetlist.cpp: use existing loop to calc max height of buttons

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

------------------
This commit was generated by Migit
2013-03-21 12:33:09 +01:00
vanhofen
ff9a6c06d1 bouquetlist.cpp: fix buttonbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: d90ae61449
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-21 (Thu, 21 Mar 2013)

Origin message was:
------------------
- bouquetlist.cpp: fix buttonbar

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

------------------
This commit was generated by Migit
2013-03-21 12:13:16 +01:00
[CST] Focus
262c2de611 gui/bouquetlist.cpp: fix bc2ec1f0de:
double ::paintButtons calls was added ?


Origin commit data
------------------
Branch: ni/coolstream
Commit: 96cd5c94af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-14 (Thu, 14 Mar 2013)



------------------
This commit was generated by Migit
2013-03-14 11:57:02 +04:00
Stefan Seyfried
bc2ec1f0de bouquetlist: only show active buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: b523fe59c0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-12 16:32:51 +04:00
Stefan Seyfried
97c4074fba bouquetlist: fix width calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c982e3d49
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-12 16:32:19 +04:00
Stefan Seyfried
581236de89 bouquetlist: mark autogenerated bouquets as readonly
this at least prevents modification from the context menu,
needs more work in the service->bouquetmanagement menus


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



------------------
This commit was generated by Migit
2013-03-12 16:32:12 +04:00
Stefan Seyfried
2fc802bf2c bouquetlist: only show active buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5acf5a489b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-11 13:32:06 +01:00
Stefan Seyfried
8f0381fdfb bouquetlist: fix width calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0613e43736
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-11 13:32:06 +01:00
Stefan Seyfried
4f1e878934 bouquetlist: mark autogenerated bouquets as readonly
this at least prevents modification from the context menu,
needs more work in the service->bouquetmanagement menus


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



------------------
This commit was generated by Migit
2013-03-11 13:32:06 +01:00
Stefan Seyfried
ae1bbd7cd0 bouquetlist: only show active buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6260e3862
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-10 00:04:23 +01:00
Stefan Seyfried
8258b38a53 bouquetlist: fix width calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: e08ee68cd6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-10 00:01:04 +01:00
Stefan Seyfried
5f23a1fefd bouquetlist: mark autogenerated bouquets as readonly
this at least prevents modification from the context menu,
needs more work in the service->bouquetmanagement menus


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



------------------
This commit was generated by Migit
2013-03-09 23:58:31 +01:00
Stefan Seyfried
fbee2df820 Merge branch 'uncool/dvbsi++'
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


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



------------------
This commit was generated by Migit
2012-11-11 01:45:22 +01:00
Jacek Jendrzej
8286a1702c src/gui/bouquetlist.cpp: close FAV window with rc-fav only in FAV mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80fe0c9307
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-05 16:45:34 +01:00
Stefan Seyfried
58ca3266e7 Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2012-11-03 10:45:33 +01:00
Jacek Jendrzej
71ae852521 src/gui/bouquetlist.cpp: fix width
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc73e4de86
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-27 (Sat, 27 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-27 20:00:35 +02:00
[CST] Focus
b0a61fe6c7 gui/bouquetlist.cpp: bouquet id safe-checks
Origin commit data
------------------
Branch: ni/coolstream
Commit: d71ad8700a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-23 (Tue, 23 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-23 16:15:53 +04:00
[CST] Focus
eb73a7bc12 gui/bouquetlist.cpp: fix message loop, if bouquet list is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fad279231
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-22 15:49:55 +04:00
[CST] Focus
98adb47df5 gui/bouquetlist.cpp: add updateSelection(),
fix indent


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a0b42e962
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)



------------------
This commit was generated by Migit
2012-10-22 14:23:16 +04:00
Jacek Jendrzej
65a0f6984b Neutrino: Channel list: add method isEmpty() and use it, ported from tuxbox cvs (THX Gaucho316)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35138088e3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-20 (Sat, 20 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-20 13:20:49 +02:00
Jacek Jendrzej
3e28f86c85 bouquetlist.cpp: fix width for buttontext
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a6f9467c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-18 (Thu, 18 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-18 17:17:00 +02: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
7b3a3bad6b /bouquetlist.cpp: close Favo also with RC_favorites
Origin commit data
------------------
Branch: ni/coolstream
Commit: e50a5ef013
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-12 (Wed, 12 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-12 22:48:15 +02:00
Jacek Jendrzej
67c5d7c91e remove doubles include
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-11 20:31:33 +02:00
Stefan Seyfried
3df9a6f7f5 Merge branch 'uncool/dvbsi++' commit '9d968280bac'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.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/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
2012-07-23 01:02:29 +02:00
[CST] Focus
bf625802a0 gui/bouquetlist.cpp: dont repaint, if mode not changed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fabe3d425
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-16 17:18:41 +04:00
Jacek Jendrzej
5ed8825b21 use empty() instead of size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()

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

------------------
This commit was generated by Migit
2012-06-16 09:44:42 +02:00
Jacek Jendrzej
7ec8226ad2 performance Prefer prefix ++/-- operators for non-primitive types.
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb347b3a44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-28 (Sat, 28 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-28 10:56:27 +02:00
Stefan Seyfried
c2112d87bb neutrino: adapt to the framebuffer_spark blitter change
basically add fb->blit() in every widget where necessary to
make sure the framebuffer is updated with current content


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



------------------
This commit was generated by Migit
2012-04-17 19:33:57 +02:00