Commit Graph

194 Commits

Author SHA1 Message Date
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
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
e079db2ae3 gui/infoviewer.cpp: add set/getUpdateTimer, dont set timer in start()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c6c284c2f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-02 16:09:25 +04:00
Stefan Seyfried
042f151781 add various variable initializations to keep valgrind happy
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04b916dbb7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-31 23:02:34 +01:00
[CST] Focus
a436ce1ae1 gui/infoviewer.cpp: init and reset radiotext position and size
Origin commit data
------------------
Branch: ni/coolstream
Commit: 67579409ba
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-25 (Thu, 25 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-25 18:02:57 +04:00
Jacek Jendrzej
f803f92af4 NeutrinoMessages fix memleak , ported from tuxbox cvs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c302dc90d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-21 (Sun, 21 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-21 18:45:39 +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
Thilo Graf
eb70cd2ac7 CInfoViewer: don't show tuner icon with single boxes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 807dce9497
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-30 (Thu, 30 Aug 2012)

Origin message was:
------------------
*CInfoViewer: don't show tuner icon with single boxes

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

------------------
This commit was generated by Migit
2012-09-18 12:10:17 +02:00
[CST] Focus
a0ef2af311 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f4c39fdd3
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 15:00:34 +04:00
Jacek Jendrzej
b4820e486a infoviewer.cpp:fix showSysfsHdd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 576d3d9da0
Author: Jacek Jendrzej <overx300@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 12:59:18 +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
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
[CST] Focus
5580b9cc18 use CEitManager to get EIT data
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74a761ef50
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 11:40:02 +04:00
[CST] Focus
6b81f955ae gui/infoviewer.cpp: adapt for new GetRecordMode() mask
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9630e1497d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)


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

------------------
This commit was generated by Migit
2012-08-07 12:09:39 +04: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
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
[CST] Focus
c0ec715e18 gui/infoviewer.cpp: comment unused CInfoViewerHandler
Origin commit data
------------------
Branch: ni/coolstream
Commit: 343a2b9492
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-13 (Wed, 13 Jun 2012)


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

------------------
This commit was generated by Migit
2012-06-13 15:25:55 +04:00
[CST] Focus
852989dd1f gui/infoviewer.cpp: comment all showIcon_CA_Status calls, leave only one - on event;
comment unused code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9013d64c14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-02 (Sat, 02 Jun 2012)



------------------
This commit was generated by Migit
2012-06-02 14:55:32 +04:00
Michael Liebmann
0cb84a703c Infoviewer: rework buttonbar
- add new class 'CInfoViewerBB' (infoviewer_bb.cpp)
- rework paint and calculate icons
- unused icons in the radio mode will not be displayed
- activate 'show resolution = off' in osd setup
- insert 'Display active tuner' in osd setup


Origin commit data
------------------
Branch: ni/coolstream
Commit: 364b323607
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-24 (Tue, 24 Apr 2012)

Origin message was:
------------------
* Infoviewer: rework buttonbar

- add new class 'CInfoViewerBB' (infoviewer_bb.cpp)
- rework paint and calculate icons
- unused icons in the radio mode will not be displayed
- activate 'show resolution = off' in osd setup
- insert 'Display active tuner' in osd setup


------------------
This commit was generated by Migit
2012-05-19 15:46:37 +01:00
vanhofen
452e362fde infoviewer.cpp: more suitable icons for tuner
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b1d063c04
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-05-14 (Mon, 14 May 2012)

Origin message was:
------------------
- infoviewer.cpp: more suitable icons for tuner

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

------------------
This commit was generated by Migit
2012-05-14 21:56:16 +02:00
Jacek Jendrzej
dc4c528134 initialize volues
Origin commit data
------------------
Branch: ni/coolstream
Commit: 489d88a9a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-09 (Wed, 09 May 2012)


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

------------------
This commit was generated by Migit
2012-05-09 17:33:34 +02:00
[CST] Focus
006cc70f93 gui/infoviewer.cpp: add destructor
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e1b370321
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)


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

------------------
This commit was generated by Migit
2012-05-04 16:52:07 +04:00
[CST] Focus
104398b293 gui/infoviewer.cpp: fix crash, if s.f_blocks is 0
happens if network_nfs_recordingdir set to not mounted dir under tmp or media


Origin commit data
------------------
Branch: ni/coolstream
Commit: 36b80096b9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-19 (Thu, 19 Apr 2012)



------------------
This commit was generated by Migit
2012-04-19 18:26:47 +04:00
[CST] Focus
e04f6e2d0a gui/infoviewer.cpp: dont use zapit client getCurrentServiceInfo()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b8adae5bd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-18 (Wed, 18 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-18 19:00:43 +04: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
Stefan Seyfried
d9113c3d50 spark: revert framebuffer scaling commits
we're going to use the STFB blitter instead of manually
scaling everything if the videomode is not 720p, so more
or less revert all commits regarding FB scaling:

Revert "fontrenderer: scale fonts for nonstandard FB resolutions"
Revert "neutrino: resize framebuffer on videomode change"
Revert "fontrenderer: fix issue with epgwindow font when FB is scaling"
Revert "neutrino: fix artefacts with scaling framebuffer and 1080i"
Revert "spark: draw lines 2px wide instead of 1 in full-HD mode"
Revert "spark: do not scale framebuffer for PAL mode"
Revert "spark: fix framebuffer glitches"
Revert "spark: do not sync blitter after every rectangle (improves performance)"


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



------------------
This commit was generated by Migit
2012-04-17 19:33:57 +02:00
Stefan Seyfried
8b82d1a5cf infoviewer: only show remaining time if time is set
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8cf78a490
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-25 (Sun, 25 Mar 2012)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:57 +02:00
Stefan Seyfried
ee389b1e94 neutrino: various fixes and ports from the original
* avoid ambiguities in new and delete by always allocating char[]
* get rid of unused next_program_timer
* reduce code differences to original, known good neutrino code


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



------------------
This commit was generated by Migit
2012-04-17 19:33:56 +02:00
Stefan Seyfried
9990f43d3e misc variable init fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3189f7fdc4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-24 (Sat, 24 Mar 2012)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:56 +02:00
Stefan Seyfried
3f0fc651b9 neutrino: fix artefacts with scaling framebuffer and 1080i
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1182430ac3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-10 (Sat, 10 Mar 2012)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:54 +02:00
Stefan Seyfried
7901a756fe neutrino: avoid float for percent calculations
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb6633b7aa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-12-25 (Sun, 25 Dec 2011)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:51 +02:00
Stefan Seyfried
50fede66bd neutrino: port "EPG title in LCD" from tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a99ff05934
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-01-26 (Wed, 26 Jan 2011)


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

------------------
This commit was generated by Migit
2012-04-17 19:33:45 +02:00
[CST] Focus
e7f127d107 gui/infoviewer.cpp: set chanready on NeutrinoMessages::EVT_TUNE_COMPLETE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fd5fc01e8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-17 (Tue, 17 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-17 14:58:11 +04:00
[CST] Focus
0bb078b6a9 GUI: add support for L/R, use transponder::pol to display polarization
Origin commit data
------------------
Branch: ni/coolstream
Commit: c14741dcd2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-16 (Mon, 16 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-16 16:56:26 +04:00
[CST] Focus
95b0d68a15 gui/infoviewer.cpp: commit bouquetList checks, it never should be NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea9c2fc136
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-05 (Thu, 05 Apr 2012)


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

------------------
This commit was generated by Migit
2012-04-05 20:32:09 +04:00
[CST] Focus
a07cc1a7b1 Merge branch 'multituner' into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5027559691
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-16 14:22:37 +04:00
[CST] Focus
627a09fa1b gui/infoviewer.cpp: add safe check
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02099ffd9a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-16 14:20:26 +04:00
[CST] Focus
f7d6d1efc9 fix conflict
Origin commit data
------------------
Branch: ni/coolstream
Commit: 68201bad9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-16 14:11:06 +04:00
Jacek Jendrzej
b1386e14c7 show infobar with colored freq after SDT freq update
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2150 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e7f4a0a9cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-03-15 (Thu, 15 Mar 2012)



------------------
This commit was generated by Migit
2012-03-15 18:06:22 +00:00
[CST] Focus
1d403b5f36 WIP. stop assuming whole channel list selected == channel number
Origin commit data
------------------
Branch: ni/coolstream
Commit: 008940a3b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-14 (Wed, 14 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-14 19:44:06 +04:00
[CST] Focus
5dcf3df49c gui/infoviewer.cpp: add showTitle for t_channel_id and CZapitChannel
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5e1e9948
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-13 20:29:44 +04:00
[CST] Focus
755b266e1a Merge branch 'multituner' into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: a41d93a686
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-07 18:50:05 +04:00
[CST] Focus
aed3837e48 fix conflict
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55f29c5daf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-07 17:55:10 +04:00
Jacek Jendrzej
a8e2c3cab6 remove never used volues
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2138 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2591100c42
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)



------------------
This commit was generated by Migit
2012-03-04 17:25:48 +00:00
[CST] Focus
f1f70dea03 Merge branch 'master', remote-tracking branch 'origin' into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3d2895847
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-02 19:31:49 +04:00
[CST] Focus
5f7d6d49a2 Merge branch 'master' into multituner
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ecc60cf71
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)


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

------------------
This commit was generated by Migit
2012-03-02 18:59:50 +04:00