Commit Graph

199 Commits

Author SHA1 Message Date
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
fcd0467caf movieinfo: internally rename epgEpgId -> epgId
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa8a3849f4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
db37495d47 movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 625cbb6122
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
525688ef8a movieinfo: internally rename epgChannel -> ChannelName
Origin commit data
------------------
Branch: ni/coolstream
Commit: a85d539bd0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
9e5c1f0439 movieinfo: internally rename epgAudioPid -> AudioPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5dcb1c4f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
90a9e96ab7 movieinfo: internally rename epgVTXPID -> VtxtPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: c1feaad8fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVTXPID -> VtxtPid

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
0bdf75c94d movieinfo: internally rename epgVideoPid -> VideoPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bb566eba5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
vanhofen
cc4ad85976 movieinfo: internally rename epgMode -> mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c37abc0a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgMode -> mode

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

------------------
This commit was generated by Migit
2016-09-10 00:32:35 +02:00
Jacek Jendrzej
d4334efc13 some compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8638cd73b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-22 (Fri, 22 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-22 16:46:21 +02:00
Jacek Jendrzej
9a77db4fb1 add av_dict_free, fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: a830d0d587
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-04 (Mon, 04 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-04 15:38:51 +02:00
Jacek Jendrzej
9ce2437cd4 add headers ffmpeg option for luascript bg play; use in script 'entry['header'] = 'Cookie: var=name';
Origin commit data
------------------
Branch: ni/coolstream
Commit: a61b8de691
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-25 (Fri, 25 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-25 17:16:54 +01:00
[CST] Focus
3d0cf84664 driver/record.cpp, driver/streamts.cpp: ignore bitstream filter errors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59c4b42376
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-21 (Mon, 21 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-21 13:44:43 +03:00
[CST] Focus
1c9c19133d driver/record.cpp, driver/streamts.cpp: add more formats, for testing
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3a2657c9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-12 14:53:11 +03:00
Michael Liebmann
f35562bc78 src/driver/record.cpp: Fix compiler warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: a92d7bd037
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-04 14:15:50 +01:00
[CST] Focus
d7b72b01ee driver/record.cpp: fix webtv record for live urls via lua plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e65e72c72
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-04 13:04:17 +03:00
Jacek Jendrzej
6cee2ec1cd fix AddressSanitizer: strncpy-param-overlap: memory ranges
Origin commit data
------------------
Branch: ni/coolstream
Commit: d96f15fb6c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-24 18:46:12 +01:00
Jacek Jendrzej
c9e2d4794c src/driver/record.cpp check avformat_write_header return
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e602c0c95
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-06 (Sat, 06 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-06 15:19:18 +01:00
Stefan Seyfried
0a95a07654 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-28 16:15:14 +01:00
Jacek Jendrzej
86cc4a8fb9 some gcc5 compil fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddb3c15d4b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-26 17:03:42 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


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



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
vanhofen
e0be05c790 record.cpp: align CODEC_ID defines to current ffmpeg code (thx to flk)
Origin commit data
------------------
Branch: ni/coolstream
Commit: bab181ab5b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-21 (Wed, 21 Oct 2015)

Origin message was:
------------------
- record.cpp: align CODEC_ID defines to current ffmpeg code (thx to flk)

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

------------------
This commit was generated by Migit
2015-10-21 11:55:48 +02:00
vanhofen
6a800d849f record.cpp: remove unnecessary executable flag from ts-file
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07df9d28e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-14 (Wed, 14 Oct 2015)

Origin message was:
------------------
- record.cpp: remove unnecessary executable flag from ts-file

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

------------------
This commit was generated by Migit
2015-10-14 13:11:08 +02:00
vanhofen
791dcfc826 record.cpp: resort flags for xml-file and ts-file; add O_CLOEXEC to ts-file
Origin commit data
------------------
Branch: ni/coolstream
Commit: be2c0a44cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-14 (Wed, 14 Oct 2015)

Origin message was:
------------------
- record.cpp: resort flags for xml-file and ts-file; add O_CLOEXEC to ts-file

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

------------------
This commit was generated by Migit
2015-10-14 13:08:20 +02:00
[CST] Focus
75dfd624b0 driver/record.cpp: add expetimental support for webtv recording,
allowed formats hls and mpegts, ffmpeg must have mpegts muxer support


Origin commit data
------------------
Branch: ni/coolstream
Commit: f0eac5d3e0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-07 (Wed, 07 Oct 2015)



------------------
This commit was generated by Migit
2015-10-07 13:48:46 +03:00
Jacek Jendrzej
71e8037a22 src/gui/eventlist.cpp fix timeshif_record timer handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65a237c991
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-20 (Thu, 20 Aug 2015)


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

------------------
This commit was generated by Migit
2015-08-20 15:51:57 +02:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Stefan Seyfried
31c7317205 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)



------------------
This commit was generated by Migit
2015-02-07 23:12:01 +01:00
[CST] Focus
b492148034 eitd: as long as neutrino using only first content classification,
reduce content classification caching (leaving old code with ifdef)


Origin commit data
------------------
Branch: ni/coolstream
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)



------------------
This commit was generated by Migit
2015-01-30 19:47:30 +03:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
[CST] Focus
d8b0c41947 neutrino.cpp: try to fix timeshift stop/restart,
after quit from playback audioplayer, picture viewer and so on


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecff984432
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)



------------------
This commit was generated by Migit
2015-01-21 18:00:25 +03:00
[CST] Focus
0f063e793d driver/record.cpp: fix crash due to epgdata.info1 len more than buffer size
Origin commit data
------------------
Branch: ni/coolstream
Commit: cbdab7d8c0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-14 (Wed, 14 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-14 12:46:09 +03:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


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



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
Jacek Jendrzej
c5f4e00058 try to fix segfault on webtv channel - neutrino shutdown
Origin commit data
------------------
Branch: ni/coolstream
Commit: b22625aa36
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-13 (Thu, 13 Nov 2014)

Origin message was:
------------------
-try to fix segfault on webtv channel - neutrino shutdown

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

------------------
This commit was generated by Migit
2014-11-13 15:38:30 +01:00
[CST] Focus
a4e40b3c8f Revert "driver/record: auto-terminate temporary timeshift recordings"
commit can stop plain record instead of timeshift, and breaks auto-timeshift concept

This reverts commit aaa305dd57.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ad1a64f73
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)



------------------
This commit was generated by Migit
2014-10-01 16:10:36 +04:00
martii
fa926258f0 driver/record: CRecordInstance::MakeExtFileName(): set dummy values on EPG failure
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9cd4af2dd2
Author: martii <m4rtii@gmx.de>
Date: 2014-09-21 (Sun, 21 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-29 14:36:10 +04:00
martii
5f118b65da MI_MOVIE_INFO: add constructor
Conflicts:
	src/driver/record.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieinfo.cpp
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e611ed381d
Author: martii <m4rtii@gmx.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-09-25 14:44:53 +04:00
martii
aa0db3a6b2 check for active downloads before shutting down; indicate dl on vfd
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/simple_display.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a3adf2798a
Author: martii <m4rtii@gmx.de>
Date: 2013-12-15 (Sun, 15 Dec 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
martii
99f9745c97 drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)



------------------
This commit was generated by Migit
2014-09-15 11:44:08 +04:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
[CST] Focus
5ee14dabdd merge neutrino-mp menu/buttons/icons changes, (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-17 17:02:25 +04:00
martii
aaa305dd57 driver/record: auto-terminate temporary timeshift recordings
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9d78e1a9c
Author: martii <m4rtii@gmx.de>
Date: 2014-07-06 (Sun, 06 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-07 08:35:12 +02:00
[CST] Focus
18a4b5647d driver/record.cpp: create record directory before record
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3124ed62cf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-30 (Fri, 30 May 2014)


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

------------------
This commit was generated by Migit
2014-06-03 13:24:04 +04:00
Jacek Jendrzej
ce38dcf12e add h265 to record and stream
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9483e019e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-05-29 (Thu, 29 May 2014)

Origin message was:
------------------
-add h265 to record and stream

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

------------------
This commit was generated by Migit
2014-05-29 16:23:36 +02:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


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



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
FlatTV
6997e249a8 record menu: add filename template
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0055b5339
Author: FlatTV <FlatTV@gmx.de>
Date: 2014-03-13 (Thu, 13 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-14 09:39:57 +01:00
[CST] Focus
05d460b1cd driver/record.cpp: always use configured hours to record for temporary timeshift;
cleanup unused code


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8074000b23
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-11 (Tue, 11 Mar 2014)



------------------
This commit was generated by Migit
2014-03-11 16:22:50 +04:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
[CST] Focus
462b2cbf6d driver/record.cpp: use wakeup_hdd();
save xml before record start


Origin commit data
------------------
Branch: ni/coolstream
Commit: ee38ad2750
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)



------------------
This commit was generated by Migit
2014-02-12 16:47:29 +04:00
[CST] Focus
5b7a26d215 driver/record.cpp: try to flush hdd buffers, if hdd is in standby at record start
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d3e169f1e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-05 14:02:46 +04:00