Commit Graph

94 Commits

Author SHA1 Message Date
Stefan Seyfried
dc5f739047 audioplayer: avoid out-of-bounds access
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6148b976aa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)


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

------------------
This commit was generated by Migit
2013-05-24 16:58:59 +02:00
Stefan Seyfried
8a02535b97 audioplayer: g_Sectionsd is gone when destructor runs
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7e0bdfb27
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)


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

------------------
This commit was generated by Migit
2013-05-24 16:58:18 +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
[CST] Focus
0c3a4fa858 Merge branch 'pu/cc' into next-cc
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 13:32:12 +04:00
Stefan Seyfried
6a3cf1003b Merge branch 'check/pu-cc' into master
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2013-04-13 17:17:30 +02:00
Michael Liebmann
7d291ceda9 src/gui/audioplayer.cpp: Fix osd (draw frame)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55e37eb2b5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
* src/gui/audioplayer.cpp: Fix osd (draw frame)

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

------------------
This commit was generated by Migit
2013-04-08 16:01:27 +01:00
Stefan Seyfried
28bf94b711 audioplayer: don't free curl_handle too early
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5c6160384
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 10:36:18 +02:00
Stefan Seyfried
3739b6846f audioplayer: don't free curl_handle too early
Origin commit data
------------------
Branch: ni/coolstream
Commit: fcd65c2ce3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-08 10:14:17 +04:00
Michael Liebmann
8765de2984 src/gui/audioplayer.cpp: Fix segfault in audioplayer osd
Origin commit data
------------------
Branch: ni/coolstream
Commit: f1740ac21b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-07 (Sun, 07 Apr 2013)

Origin message was:
------------------
* src/gui/audioplayer.cpp: Fix segfault in audioplayer osd

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

------------------
This commit was generated by Migit
2013-04-08 10:02:40 +04:00
Michael Liebmann
8e2aeb7b4a src/gui/audioplayer.cpp: Fix segfault in audioplayer osd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a9a347ee3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-07 (Sun, 07 Apr 2013)

Origin message was:
------------------
* src/gui/audioplayer.cpp: Fix segfault in audioplayer osd

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

------------------
This commit was generated by Migit
2013-04-07 22:07:38 +01:00
Stefan Seyfried
cc70fcc214 audioplayer: don't free curl_handle too early
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a1cb03e82
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-07 17:57:58 +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
0cad5bca1a strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4714a30f83
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp


------------------
This commit was generated by Migit
2013-04-01 15:42:38 +04:00
vanhofen
ed04cfdf36 strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


Origin commit data
------------------
Branch: ni/coolstream
Commit: 759966f935
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


------------------
This commit was generated by Migit
2013-03-25 09:45:22 +01:00
Stefan Seyfried
c7a62999f4 Merge branch 'check/next' into master
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp


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



------------------
This commit was generated by Migit
2013-03-07 17:10:11 +01:00
Thilo Graf
96f21a44eb CAudioPlayerGui: set missing corner mode for info box
Origin commit data
------------------
Branch: ni/coolstream
Commit: bdce50780d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-01 (Fri, 01 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-06 11:51:38 +01:00
Thilo Graf
65ca3aa60e CAudioPlayer: adapt for last changes in CComponents
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14f8e63cc9
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-16 (Thu, 16 Aug 2012)


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

------------------
This commit was generated by Migit
2013-03-06 11:27:53 +01:00
Thilo Graf
fa3cc75528 CAudioPlayerGui: adapt to current CComponentsInfoBox changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 360feb8db9
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-03 (Fri, 03 Aug 2012)


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

------------------
This commit was generated by Migit
2013-03-06 11:27:50 +01:00
vanhofen
4787badcc4 audioplayer.cpp: fix comparison operator
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca8f8251ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-28 (Thu, 28 Feb 2013)

Origin message was:
------------------
- audioplayer.cpp: fix comparison operator

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

------------------
This commit was generated by Migit
2013-02-28 10:02:59 +01:00
vanhofen
8d6438b44c audioplayer.cpp: reducing console spam
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57317aae31
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-27 (Wed, 27 Feb 2013)

Origin message was:
------------------
- audioplayer.cpp: reducing console spam

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

------------------
This commit was generated by Migit
2013-02-27 21:23:15 +01:00
Stefan Seyfried
77c08c4c15 Merge branch 'check/dvbsi++' commit c16f636011
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)



------------------
This commit was generated by Migit
2013-02-21 17:07:18 +01:00
vanhofen
626db78811 audioplayer.cpp: center horizontally
Origin commit data
------------------
Branch: ni/coolstream
Commit: ac3e482cca
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-20 (Wed, 20 Feb 2013)

Origin message was:
------------------
- audioplayer.cpp: center horizontally

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

------------------
This commit was generated by Migit
2013-02-20 23:52:30 +01:00
vanhofen
d37d693cc8 audioplayer.cpp: fix display of buttons and round corners in footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92e6d383bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-20 (Wed, 20 Feb 2013)

Origin message was:
------------------
- audioplayer.cpp: fix display of buttons and round corners in footer

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

------------------
This commit was generated by Migit
2013-02-20 03:00:09 +01:00
vanhofen
ff7b56035d audioplayer: don't paint something if screensaver is active
Origin commit data
------------------
Branch: ni/coolstream
Commit: 178ec028cb
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-20 (Wed, 20 Feb 2013)

Origin message was:
------------------
- audioplayer: don't paint something if screensaver is active

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

------------------
This commit was generated by Migit
2013-02-20 02:09:26 +01:00
vanhofen
8e93ba0e33 audioplayer.cpp: remove not working code with mute-icon handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed52353607
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-20 (Wed, 20 Feb 2013)

Origin message was:
------------------
- audioplayer.cpp: remove not working code with mute-icon handling

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

------------------
This commit was generated by Migit
2013-02-20 00:59:39 +01:00
vanhofen
0d6d5afd3e audioplayer.cpp: ignore first keypress when screensaver is on
just quit the screensaver and return to loop


Origin commit data
------------------
Branch: ni/coolstream
Commit: 95b51f6993
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-19 (Tue, 19 Feb 2013)

Origin message was:
------------------
- audioplayer.cpp: ignore first keypress when screensaver is on

just quit the screensaver and return to loop


------------------
This commit was generated by Migit
2013-02-19 22:09:47 +01:00
vanhofen
58bfc8e31e audioplayer.cpp: fix cursor-background with round borders
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59642214f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-19 (Tue, 19 Feb 2013)

Origin message was:
------------------
- audioplayer.cpp: fix cursor-background with round borders

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

------------------
This commit was generated by Migit
2013-02-19 11:11:58 +01:00
vanhofen
2800b56178 audioplayer.cpp: restore correct background when leaving screensaver
and remove background-pic from screensaver-loop


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e828fa0a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-19 (Tue, 19 Feb 2013)

Origin message was:
------------------
- audioplayer.cpp: restore correct background when leaving screensaver

and remove background-pic from screensaver-loop


------------------
This commit was generated by Migit
2013-02-19 00:11:12 +01:00
Stefan Seyfried
4edeb50241 Merge branch 'uncool/dvbsi++'
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


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



------------------
This commit was generated by Migit
2012-11-23 18:45:22 +01:00
[CST] Focus
a1e87094f2 gui/audioplayer.cpp: return menu_return::RETURN_EXIT_ALL on standby/shutdown,
thanks satbaby for patch


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d7f1efd06
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)



------------------
This commit was generated by Migit
2012-11-16 15:45:39 +04: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
defans
50af8bd0c9 add pictureviewer to info-key in audioplayer
Origin commit data
------------------
Branch: ni/coolstream
Commit: e145f9a5e8
Author: defans <defans@bluepeercrew.us>
Date: 2012-11-06 (Tue, 06 Nov 2012)

Origin message was:
------------------
- add pictureviewer to info-key in audioplayer

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

------------------
This commit was generated by Migit
2012-11-06 23:04:55 +01:00
Stefan Seyfried
a603ec74af Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'
...needs buildfixing...

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


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



------------------
This commit was generated by Migit
2012-10-14 12:51:07 +02:00
gixxpunk
d493b1155c audioplayer: fix memleak (THX martii)
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc95ffa37c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)

Origin message was:
------------------
- audioplayer: fix memleak (THX martii)

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

------------------
This commit was generated by Migit
2012-10-11 21:05:44 +02:00
Stefan Seyfried
2fed5051d5 get rid of NEW_CURL hack, this API is long obsolete
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25446f7408
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-06 (Sat, 06 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-06 17:29:09 +02:00
Jacek Jendrzej
29c30bb247 my_system fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87342fd0d9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-15 (Sat, 15 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-15 11:20:49 +02:00
Jacek Jendrzej
b021be7aa1 if curl version
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86632f0369
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 18:28:11 +02:00
Jacek Jendrzej
7e4fd63bf2 add wakeup_hdd & file_exists to system-helpers
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6ae7255ac
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)

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

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

------------------
This commit was generated by Migit
2012-09-11 20:35:47 +02:00
Jacek Jendrzej
41fbcb0970 start SCRIPTs with-my_system
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3389defb17
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:33:34 +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
Michael Liebmann
0f3e319922 Audioplayer: Small display bugs fixed
- Use 'full paint' for infobox


Origin commit data
------------------
Branch: ni/coolstream
Commit: e7a1dca8ea
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)

Origin message was:
------------------
* Audioplayer: Small display bugs fixed

- Use 'full paint' for infobox


------------------
This commit was generated by Migit
2012-07-23 09:07:11 +01: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
Michael Liebmann
fb32f63b71 Audioplayer: Small display bugs fixed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52a5640bc2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-22 (Sun, 22 Jul 2012)

Origin message was:
------------------
* Audioplayer: Small display bugs fixed

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

------------------
This commit was generated by Migit
2012-07-22 18:30:19 +01:00
Michael Liebmann
ded0dc6025 Audioplayer: CComponentsInfoBox use to paint infobox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 64b3debba2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-22 (Sun, 22 Jul 2012)

Origin message was:
------------------
* Audioplayer: CComponentsInfoBox use to paint infobox

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

------------------
This commit was generated by Migit
2012-07-22 17:16:38 +01:00
Thilo Graf
0ed04a868f neutrino: remove dub code
using class 'CComponentsDetailLine' instead multiple code
details line rendering


Origin commit data
------------------
Branch: ni/coolstream
Commit: 261904acd0
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-16 (Mon, 16 Jul 2012)

Origin message was:
------------------
*neutrino: remove dub code

using class 'CComponentsDetailLine' instead multiple code
details line rendering


------------------
This commit was generated by Migit
2012-07-16 22:28:02 +02:00
Jacek Jendrzej
0c1ce3f287 fix tiny OSD shadow
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2b948933a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-12 17:58:32 +02:00
Jacek Jendrzej
57a8207de7 fix OSD
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1196a01818
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-11 15:59:41 +02:00
Jacek Jendrzej
1fc94b37ae fix gcc 4.7.x warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 060c1c45b2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-07 13:09:08 +02:00