Commit Graph

490 Commits

Author SHA1 Message Date
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
7e692549d3 Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
2013-07-06 19:01:15 +02:00
Michael Liebmann
99e28fe73d Fix paint VolumeBar on InfoViewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31e2dae622
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-26 (Wed, 26 Jun 2013)


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

------------------
This commit was generated by Migit
2013-07-03 07:30:09 +02:00
Stefan Seyfried
a2055b2b47 infoviewer: always paint 'no epg...' in the same place
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93a428c817
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)


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

------------------
This commit was generated by Migit
2013-05-31 12:25:58 +02:00
Stefan Seyfried
c1270a762c infoviewer: simplify show_current_next()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06ea41f003
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)


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

------------------
This commit was generated by Migit
2013-05-31 12:24:54 +02:00
Stefan Seyfried
2fcce66c1a infoviewer: always paint 'no epg...' in the same place
Origin commit data
------------------
Branch: ni/coolstream
Commit: da79e3b205
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)


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

------------------
This commit was generated by Migit
2013-05-31 11:33:47 +02:00
Stefan Seyfried
680b445937 infoviewer: simplify show_current_next()
Origin commit data
------------------
Branch: ni/coolstream
Commit: a579bd092b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)


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

------------------
This commit was generated by Migit
2013-05-31 11:33:04 +02:00
Stefan Seyfried
07ccb9a351 Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2013-05-24 20:24:39 +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
vanhofen
93484713fe infoviewer: get width of timescale from progressbar object ...
.. to remove hardcoded timescale width in showInfoFile()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d5ecda6e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- infoviewer: get width of timescale from progressbar object ...

.. to remove hardcoded timescale width in showInfoFile()


------------------
This commit was generated by Migit
2013-05-10 09:33:25 +02:00
Thilo Graf
30a4e4015e CInfoViewer: use correct text color in showInfoFile()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19f2d556ee
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-27 22:20:10 +02:00
Thilo Graf
58a2d0755f CInfoViewer: add member killInfobarText()
Ensure that no unnecessary instance of Components infobox is generated
and paint only changed text.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 54d0f8b42b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)



------------------
This commit was generated by Migit
2013-04-27 22:20:10 +02:00
Thilo Graf
dadaa268a5 CInfoViewer: ensure hide on deleted info file
Origin commit data
------------------
Branch: ni/coolstream
Commit: e30f4d2764
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-25 (Thu, 25 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-27 22:20:09 +02:00
Jacek Jendrzej
43c78ead77 CInfoViewer::showInfoFile -check file size
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d088357c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)



------------------
This commit was generated by Migit
2013-04-26 18:31:40 +02:00
Thilo Graf
029f6ed93d CInfoViewer: implement CComponentsInfoBox() to show infobar.txt content
Origin commit data
------------------
Branch: ni/coolstream
Commit: a09d7f4a7e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-24 (Wed, 24 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-26 18:31:39 +02:00
Stefan Seyfried
37a6550723 infoviewer: remove unneeded blit()
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7a4927b53
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-21 (Sun, 21 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-21 18:07:41 +02:00
Michael Liebmann
f4bf2786de Infoviewer: Fix key handling for PiP
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e3e8e981b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-19 (Fri, 19 Apr 2013)

Origin message was:
------------------
* Infoviewer: Fix key handling for PiP

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

------------------
This commit was generated by Migit
2013-04-19 00:38:34 +01: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
0de32c2a3b CInfoViewer: delete infoViewerBB in destructor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 268c5b84e9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
96329a4af9 CInfoViewer: delete infoViewerBB in destructor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e4603071e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-15 19:46:12 +02:00
Stefan Seyfried
3bc4f713c4 CInfoViewer: delete infoViewerBB in destructor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17c624db4d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-14 19:15:46 +02:00
Stefan Seyfried
ab5760e4de Merge branch 'check/pu-cc' into master
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b689f4b26
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 14:28:16 +02:00
Thilo Graf
307a8675b6 Progressbars: use default frame thickness
It's unnecessary overhead to set the value everywhere, except it's needed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f70a30defa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-05 (Fri, 05 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 08:33:51 +02:00
Michael Liebmann
81953e4bb6 Fix order of colors for some progress bars
Origin commit data
------------------
Branch: ni/coolstream
Commit: adfbfe079c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)

Origin message was:
------------------
* Fix order of colors for some progress bars

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

------------------
This commit was generated by Migit
2013-04-05 19:43:50 +01:00
vanhofen
647363ca60 infoviewer: remove frame from timescale inside infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85ab392a09
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-04 (Thu, 04 Apr 2013)

Origin message was:
------------------
- infoviewer: remove frame from timescale inside infoviewer

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

------------------
This commit was generated by Migit
2013-04-04 14:41:13 +02:00
Thilo Graf
71248e0dc7 CComponents: add progressbar class to cc-items
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item

TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework


Origin commit data
------------------
Branch: ni/coolstream
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-02 09:31:05 +02:00
Stefan Seyfried
1a52a851d2 infoviewer: make oldinfo a member of the class
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ee9088f28
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)


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

------------------
This commit was generated by Migit
2013-04-01 15:48:00 +04:00
[CST] Focus
337f34d506 gui/infoviewer.cpp: fix tuner icon display
Origin commit data
------------------
Branch: ni/coolstream
Commit: d60f6691d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-26 19:54:29 +04:00
[CST] Focus
e9411db235 gui/infoviewer.cpp: update progress in file play mode while visible
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60cfc785cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-26 18:46:09 +04:00
[CST] Focus
30ea241a2f gui/infoviewer.cpp: show playback speed with play state icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbc4285510
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-26 17:40:04 +04:00
Stefan Seyfried
af5f76d64b infoviewer: make oldinfo a member of the class
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5033a9e4ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-25 18:02:46 +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
[CST] Focus
d0ccb2c97d Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
2013-02-28 16:39:34 +04:00
Jacek Jendrzej
aedcc54a00 src/gui/infoviewer.cpp: fix paint progressbar opt 1
Origin commit data
------------------
Branch: ni/coolstream
Commit: 662955f9e7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-23 (Sat, 23 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-23 17:34:12 +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
Jacek Jendrzej
5d4baefb89 src/gui/infoviewer.cpp: fix div by zero
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fc78c5738
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-16 (Sat, 16 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-16 21:25:02 +01:00
vanhofen
8bd6190170 infoviewer.cpp: change width of infobar.txt-field ...
... in dependency from g_settings.infobar_progressbar


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0986c3af8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-14 (Thu, 14 Feb 2013)

Origin message was:
------------------
- infoviewer.cpp: change width of infobar.txt-field ...

... in dependency from g_settings.infobar_progressbar


------------------
This commit was generated by Migit
2013-02-14 19:14:47 +01:00
[CST] Focus
e1b0837ce1 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6174c657a1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-13 15:34:41 +04:00
Jacek Jendrzej
a46d3a42ef add progressbar opt to infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63c66c1f4e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-12 18:03:50 +01:00
Jacek Jendrzej
ce549b87b4 src/gui/infoviewer.cpp: fix channel name getRenderWidth for unicode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 158ad4243f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-11 10:39:34 +01:00
Stefan Seyfried
baee6a8a1e infoviewer: don't suppress valid 'next' events
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33332355b0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-05 19:48:13 +01:00
[CST] Focus
4b0932ca1e gui/infoviewer.cpp: check live frontend for delivery system
Origin commit data
------------------
Branch: ni/coolstream
Commit: f10ea0636d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-16 15:48:21 +04:00
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


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



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +01:00
Jacek Jendrzej
fa069d793b supplement to faad967b97, simplification
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59fa692bd0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-08 16:28:53 +01:00
Jacek Jendrzej
faad967b97 add provider name to infobar , no gui option
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bebdf91e0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-08 11:15:40 +01:00
Stefan Seyfried
8fa2b5739f infoviewer: make oldinfo a member of the class
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57911bf009
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-21 (Wed, 21 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-21 18:19:39 +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
Stefan Seyfried
30b5111ce1 tripledragon: fix LCD epg title after standby
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6392a99ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-10 (Sat, 10 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-10 13:56:36 +01:00
Jacek Jendrzej
f35b64432a initialize not initialized var
Origin commit data
------------------
Branch: ni/coolstream
Commit: 926e0ce141
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Origin message was:
------------------
initialize not initialized var

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

------------------
This commit was generated by Migit
2012-11-05 09:24:51 +01:00