Commit Graph

127 Commits

Author SHA1 Message Date
vanhofen
8474ef8c98 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 13:08:01 +02:00
vanhofen
59c83b2c70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:30:10 +02:00
vanhofen
f23c56ed95 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-24 10:06:31 +02:00
Stefan Seyfried
1df6d63abc record, streamts: use modern AV_CODEC_ID enums
this allows to build with current ffmpeg


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



------------------
This commit was generated by Migit
2016-10-24 09:45:23 +02:00
Stefan Seyfried
6abba22cdc record, streamts: use modern AV_CODEC_ID enums
this allows to build with current ffmpeg


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f33ee96fd
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 12:02:10 +02:00
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
286fc1df97 Merge branch 'ni/cst-next' into ni/mp/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d035edb33
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-29 11:59:40 +02:00
vanhofen
e24664e0ea Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f69fdc425b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)


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

------------------
This commit was generated by Migit
2016-09-29 11:59:21 +02:00
vanhofen
45ce83f50c streamts: fix -Wformat warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: f45d4d2bd5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)

Origin message was:
------------------
- streamts: fix -Wformat warning

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

------------------
This commit was generated by Migit
2016-09-29 10:53:06 +02:00
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
a19fe6bed0 Fix merge conflicts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-20 09:01:33 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
TangoCash
d934b1313a add support for H265
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d8986b09d
Author: TangoCash <eric@loxat.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)


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

------------------
This commit was generated by Migit
2016-07-31 21:28:53 +02:00
Jacek Jendrzej
9ebb6725a3 src/driver/streamts.cpp try to fix send err loop
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed02b4c81e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-11 (Mon, 11 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-11 12:48:09 +02:00
Jacek Jendrzej
d7f8c61cda src/driver/streamts.cpp check after new
Origin commit data
------------------
Branch: ni/coolstream
Commit: b526c2480c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-10 (Sun, 10 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-10 19:42:39 +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
Jacek Jendrzej
eec2d745e1 src/driver/streamts.cpp init bsfc, fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2adcd8b5d6
Author: Jacek Jendrzej <overx300@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 16:13:22 +01: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
[CST] Focus
fee77b75d9 driver/streamts.cpp: fix webtv streaming for live urls via lua plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: a19083f60d
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:34 +03:00
Jacek Jendrzej
5f8422c29a (performance) Prefer prefix ++/-- operators for non-primitive types
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7db16952f6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-16 13:02:10 +01:00
[CST] Focus
c6320b3f12 driver/streamts.cpp: fix webtv stream open
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97d7dc2e6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-05 19:27:31 +03:00
[CST] Focus
174fd1a727 driver/streamts.cpp: add webtv channels streaming for compatible streams
Origin commit data
------------------
Branch: ni/coolstream
Commit: c13eb939fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-05 18:57:42 +03: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
[CST] Focus
3d9bb86385 driver/streamts.cpp: bug fix: SO_SNDBUF for connection fd
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a000b6a4e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-09-24 (Thu, 24 Sep 2015)


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

------------------
This commit was generated by Migit
2015-09-24 13:32:38 +03:00
Stefan Seyfried
022bcb2f08 set threadnames to unique values
Origin commit data
------------------
Branch: ni/coolstream
Commit: fca14b17c5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-28 (Sat, 28 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-28 10:53:18 +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
[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
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
445f284bfc streamts: fix format-string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a8f4de81e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-27 19:26:51 +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
Jacek Jendrzej
60a200bc0f streamts.cpp StreamInstance::Send: do not block neutrino by faulty stream
Origin commit data
------------------
Branch: ni/coolstream
Commit: c170b03b9a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-07 (Mon, 07 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-07 16:01:27 +02:00
[CST] Focus
4fb4150168 driver/streamts.cpp: optimize poll timeout, cancel thread on stop
Origin commit data
------------------
Branch: ni/coolstream
Commit: b96a7d43a6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-27 18:56:49 +04:00
[CST] Focus
17838600dd driver/streamts.cpp: add support to stream from different tuners
Origin commit data
------------------
Branch: ni/coolstream
Commit: ded947f05a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-26 (Wed, 26 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-26 14:31:11 +04:00
[CST] Focus
4b080ace71 Revert "streamts: put zapit back into standby after streaming"
This reverts commit db18d90fb9.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 50eb534417
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-26 (Wed, 26 Mar 2014)



------------------
This commit was generated by Migit
2014-03-26 14:30:29 +04:00
[CST] Focus
e4ccee7836 Revert "streamts: set CPU freq to 'high' for streaming"
This reverts commit 29e29e16ed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1dfc9c1449
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-26 (Wed, 26 Mar 2014)



------------------
This commit was generated by Migit
2014-03-26 14:30:20 +04:00
Stefan Seyfried
29e29e16ed streamts: set CPU freq to 'high' for streaming
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9a3b34810
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-11 (Sat, 11 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-13 20:56:11 +01:00
Stefan Seyfried
db18d90fb9 streamts: put zapit back into standby after streaming
additionally, update copyright info


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c0cb5b96e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-11 (Sat, 11 Jan 2014)



------------------
This commit was generated by Migit
2014-01-13 20:55:49 +01:00
Stefan Seyfried
ecc1bb03b7 streamts: improve channel switching logic
Origin commit data
------------------
Branch: ni/coolstream
Commit: 145a1c0938
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-12 23:32:42 +01:00
Stefan Seyfried
b4ee640a4d streamts: set CPU freq to 'high' for streaming
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a37ab57a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-11 (Sat, 11 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-11 18:09:05 +01:00
Stefan Seyfried
35ef875c6d streamts: put zapit back into standby after streaming
additionally, update copyright info


Origin commit data
------------------
Branch: ni/coolstream
Commit: 573dc62736
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-11 (Sat, 11 Jan 2014)



------------------
This commit was generated by Migit
2014-01-11 18:07:17 +01:00
Stefan Seyfried
971d575b78 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
Jacek Jendrzej
22409b7c4d CGenPsi:: add EAC3 audio support, revork genpsi
Origin commit data
------------------
Branch: ni/coolstream
Commit: d92ad1de0d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-09 (Wed, 09 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-09 21:51:18 +02:00
Stefan Seyfried
2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.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/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
Jacek Jendrzej
8455ef1f6d streamts: add dvbsub and teletext pid to stream
Origin commit data
------------------
Branch: ni/coolstream
Commit: ada1ec3e60
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)


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

------------------
This commit was generated by Migit
2013-08-08 15:09:30 +02:00
Jacek Jendrzej
46af674a96 genpsi: add pcr pid handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3b584920
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)


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

------------------
This commit was generated by Migit
2013-08-01 17:54:51 +02:00
Stefan Seyfried
083bc55347 Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


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



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
[CST] Focus
715929b450 driver/streamts.cpp: use record demux, deny streaming if pip running
Origin commit data
------------------
Branch: ni/coolstream
Commit: 698b56c6db
Author: [CST] Focus <focus.cst@gmail.com>
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 13:36:58 +04:00
Stefan Seyfried
4edeb50241 Merge branch 'uncool/dvbsi++'
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


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



------------------
This commit was generated by Migit
2012-11-23 18:45:22 +01:00