Commit Graph

201 Commits

Author SHA1 Message Date
Stefan Seyfried
2e2487dbaa channellist: use "classic" width if minitv is unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: 901b7cbd38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-22 16:21:24 +01:00
Thilo Graf
9a48ba0583 CChannelList: fix position of minitv, small cleanups
This is only a provisionally fix. A rework of initialisation for
many member variables seems to be necessary.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fedb9132d7
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)



------------------
This commit was generated by Migit
2013-02-22 16:15:03 +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
Stefan Seyfried
0e01a7b32c neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


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



------------------
This commit was generated by Migit
2013-02-21 15:47:18 +01:00
Thilo Graf
2b4cf29743 CComponents: move class into its own source directory
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a961a4cf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-19 (Tue, 19 Feb 2013)



------------------
This commit was generated by Migit
2013-02-19 11:27:46 +01:00
vanhofen
9bfda4ef80 channellist.cpp: change order of painting to be more liquid
Origin commit data
------------------
Branch: ni/coolstream
Commit: b307f4c8d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-18 (Mon, 18 Feb 2013)

Origin message was:
------------------
- channellist.cpp: change order of painting to be more liquid

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

------------------
This commit was generated by Migit
2013-02-18 21:54:52 +01:00
vanhofen
544cec7f7f channellist.cpp: show pic instead of miniTV in radiomode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a7687abe1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-18 (Mon, 18 Feb 2013)

Origin message was:
------------------
- channellist.cpp: show pic instead of miniTV in radiomode

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

------------------
This commit was generated by Migit
2013-02-18 21:00:19 +01:00
vanhofen
7add27227a channellist.cpp: fix logo position if new_zap_mode is off
Origin commit data
------------------
Branch: ni/coolstream
Commit: 782c9f107c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix logo position if new_zap_mode is off

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

------------------
This commit was generated by Migit
2013-02-17 23:20:04 +01:00
vanhofen
5cb52c38dd channellist.cpp: fix broken display of infobar while zapping
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9632f3bad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix broken display of infobar while zapping

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

------------------
This commit was generated by Migit
2013-02-17 22:57:37 +01:00
vanhofen
119f0c82f6 Revert "Revert '- channellist.cpp: enable to lock new_zap_mode'"
This reverts commit 72fd77bb5f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 505c4ba80d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)



------------------
This commit was generated by Migit
2013-02-17 22:55:28 +01:00
vanhofen
a44c4bf1b8 channellist.cpp: allow colored events (for time) in right eventlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddbac1b248
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: allow colored events (for time) in right eventlist

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

------------------
This commit was generated by Migit
2013-02-17 21:55:21 +01:00
Thilo Graf
326a2211dc CComponents: move class into its own source directory
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f3f347bdb3
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)



------------------
This commit was generated by Migit
2013-02-16 12:13:24 +01:00
vanhofen
72fd77bb5f Revert "- channellist.cpp: enable to lock new_zap_mode"
This reverts commit 8b1b3b1418
because the display of infobar while zapping is broken with
this commit.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb892d18ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-15 (Fri, 15 Feb 2013)



------------------
This commit was generated by Migit
2013-02-15 22:55:45 +01:00
Michael Liebmann
e98cad9904 channellist.cpp: Show channel list vertically centered
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91d76a9487
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Show channel list vertically centered

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

------------------
This commit was generated by Migit
2013-02-13 23:34:55 +01:00
Michael Liebmann
d91211cf74 channellist.cpp: Fix time display in event list
- fix compiler warning


Origin commit data
------------------
Branch: ni/coolstream
Commit: b2f5ca589d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Fix time display in event list

- fix compiler warning


------------------
This commit was generated by Migit
2013-02-12 21:34:18 +01:00
tomworld
177ebb4fba channellist.cpp: Use extra font for event list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 105c6b4c70
Author: tomworld <atzeworld@msn.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Use extra font for event list

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

------------------
This commit was generated by Migit
2013-02-12 15:45:27 +01:00
vanhofen
8b1b3b1418 channellist.cpp: enable to lock new_zap_mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15d787f79b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- channellist.cpp: enable to lock new_zap_mode

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

------------------
This commit was generated by Migit
2013-02-10 21:03:43 +01:00
TangoCash
132c4abd78 channellist.cpp: add epg-desc to blue button ...
... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications


Origin commit data
------------------
Branch: ni/coolstream
Commit: 31080fa98c
Author: TangoCash <eric@loxat.de>
Date: 2013-02-09 (Sat, 09 Feb 2013)

Origin message was:
------------------
- channellist.cpp: add epg-desc to blue button ...

... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications


------------------
This commit was generated by Migit
2013-02-09 10:36:11 +01:00
vanhofen
aba592b157 channellist.cpp: fix restore to fullTV
... when turning miniTV off from the menu inside the channellist


Origin commit data
------------------
Branch: ni/coolstream
Commit: c6155f29b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-06 (Wed, 06 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix restore to fullTV

... when turning miniTV off from the menu inside the channellist


------------------
This commit was generated by Migit
2013-02-06 21:19:49 +01:00
vanhofen
99ceae9f06 channellist.cpp: 'fix' the double determination of dimensions/coordinates
Origin commit data
------------------
Branch: ni/coolstream
Commit: d4635b690f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: 'fix' the double determination of dimensions/coordinates

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

------------------
This commit was generated by Migit
2013-02-05 23:56:48 +01:00
vanhofen
c5de0e7e67 channellist.cpp: determinate startTimeWidth from a fixed value
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6f4ea5baa
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: determinate startTimeWidth from a fixed value

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

------------------
This commit was generated by Migit
2013-02-05 17:01:18 +01:00
vanhofen
05945fdeed channellist.cpp: remove time for no further events
thx to TangoCash.


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

Origin message was:
------------------
- channellist.cpp: remove time for no further events

thx to TangoCash.


------------------
This commit was generated by Migit
2013-02-05 01:36:28 +01:00
vanhofen
21694b1d47 channellist.cpp: fix wrong time for no further events
patch by TangoCash. thx!


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

Origin message was:
------------------
- channellist.cpp: fix wrong time for no further events

patch by TangoCash. thx!


------------------
This commit was generated by Migit
2013-02-05 00:58:31 +01:00
vanhofen
00d0c54a19 channellist.cpp: fix shortcuts in submenu and add a seperator line
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee0cb25258
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix shortcuts in submenu and add a seperator line

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

------------------
This commit was generated by Migit
2013-02-05 00:30:16 +01:00
vanhofen
ca1569c428 channellist: make miniTV switchable
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- channellist: make miniTV switchable

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

------------------
This commit was generated by Migit
2013-02-04 22:25:15 +01:00
vanhofen
5c3119d73f channellist.cpp: rework header and buttonbar
* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width


Origin commit data
------------------
Branch: ni/coolstream
Commit: 77bbdfa0c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-02 (Sat, 02 Feb 2013)

Origin message was:
------------------
- channellist.cpp: rework header and buttonbar

* paint channellogo in mini-tv-mode
* strech the positions of right elements in header marginally
* paint buttonbar over the full width


------------------
This commit was generated by Migit
2013-02-02 02:10:35 +01:00
vanhofen
28a4b5f5d6 channellist.cpp: change color for infozone
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e45607ae1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: change color for infozone

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

------------------
This commit was generated by Migit
2013-02-01 23:26:33 +01:00
vanhofen
95a719d92e channellist.cpp: fix round borders for infozone
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec4a5bf3c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-01 (Fri, 01 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix round borders for infozone

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

------------------
This commit was generated by Migit
2013-02-01 22:59:07 +01:00
Michael Liebmann
3378aeeb50 src/gui/channellist.cpp: miniTV osd fix
- Screen coordinate x could possibly receive a value under 0


Origin commit data
------------------
Branch: ni/coolstream
Commit: 49667088f7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
* src/gui/channellist.cpp: miniTV osd fix

- Screen coordinate x could possibly receive a value under 0


------------------
This commit was generated by Migit
2013-01-31 20:05:03 +01:00
Jacek Jendrzej
fe38ed371a src/gui/channellist.cpp: fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e5b54c509
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-31 16:18:05 +01:00
Jacek Jendrzej
141b1b9d65 src/gui/channellist.cpp: minitv osd fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17cfb97f9e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-31 11:14:38 +01:00
Jacek Jendrzej
08873a05cc src/gui/channellist.cpp: fix minitv gui & segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: e509f19361
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-30 23:37:11 +01:00
Jacek Jendrzej
f6f0911121 compil fix for commit 263340cd22
Origin commit data
------------------
Branch: ni/coolstream
Commit: deeed028d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-30 19:31:57 +01:00
TangoCash
263340cd22 add optional mini-tv to channellist
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)



------------------
This commit was generated by Migit
2013-01-30 19:17:52 +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
0af735aa17 src/gui/channellist.cpp:-add sort by channel number
Origin commit data
------------------
Branch: ni/coolstream
Commit: c47aebdb64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-09 17:32:15 +01:00
Stefan Seyfried
a7d632a19a neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Branch: ni/coolstream
Commit: e0acbd3ddb
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 14:05:48 +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
[CST] Focus
4de110219b gui/channellist.cpp: not allow zap on scroll mode,
if current neutrino mode is mode_ts


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



------------------
This commit was generated by Migit
2012-10-22 13:30:31 +04:00
[CST] Focus
fbeed0470d gui/channellist.cpp: dont paint channel list,
if event list return menu_return::RETURN_EXIT_ALL


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



------------------
This commit was generated by Migit
2012-10-22 13:11:54 +04:00
[CST] Focus
efb5320a4f gui/channellist.cpp: remove extra showChannelLogo(),
fix channel logo - call paint() after paintHead(),
use enum values for channel list mode


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



------------------
This commit was generated by Migit
2012-10-22 12:24:55 +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
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
Stefan Seyfried
485656f13a fixes for 64bit archs: don't assume a pointer is 32bit wide
Origin commit data
------------------
Branch: ni/coolstream
Commit: d806eeb544
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-07 17:09:17 +02:00
Stefan Seyfried
ffb81abcb1 channellist: fix parental locking
fix a merge error introduced during the twin merge (correct
code was in commt af6edcdc68)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a4e58e44f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-16 (Sun, 16 Sep 2012)

Origin message was:
------------------
channellist: fix parental locking

fix a merge error introduced during the twin merge (correct
code was in commt af6edcdc68)


------------------
This commit was generated by Migit
2012-09-16 23:57:31 +02:00
Stefan Seyfried
9eaeb2866d Merge branch 'neutrino-hd-tripledragon' into neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e46d81b88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
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 12:14:33 +02:00
[CST] Focus
e44ee11353 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fdbdbd343
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-13 11:24:13 +04: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
[CST] Focus
067a0a44c7 gui/channellist.cpp: fix p_requested_channels allocate size
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e4a396d7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)


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

------------------
This commit was generated by Migit
2012-08-30 18:11:14 +04:00
[CST] Focus
96148052c5 remove channel_id mask for CEitManager getXXX calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3f5a0e5bb1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)


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

------------------
This commit was generated by Migit
2012-08-30 14:50:01 +04:00