mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
16,036 Commits 2 Branches 9 Tags
dce69fd14a54608c8c8be07e8171e0de994061fc
Commit Graph

143 Commits

Author SHA1 Message Date
vanhofen
77be049b29 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
 2017-03-09 10:08:13 +01:00
Stefan Seyfried
6d86f585cb Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 6f1cfd42bb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 19:43:06 +01:00
Jacek Jendrzej
7364e139ad make neutrino compatible with new ffmpeg 
Origin commit data
------------------
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)
 2017-03-07 15:00:17 +01:00
vanhofen
6057caae9a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:04:09 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 23:01:15 +01:00
Stefan Seyfried
8af59f8e99 streamts: don't overflow receive buffer, better diag message 
Origin commit data
------------------
Commit: ff0d98bcc3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:58:58 +01:00
Stefan Seyfried
aa3f0a8786 streamts: don't overflow receive buffer, better diag message 
Origin commit data
------------------
Commit: ec3201ab04
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 16:56:10 +01:00
Stefan Seyfried
b5ac078ead Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: f397d08cd3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 02:14:32 +01:00
vanhofen
0d4a2a3461 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:49:24 +01:00
vanhofen
bf7cab5437 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.h


Origin commit data
------------------
Commit: 7ad8496e24
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-27 18:47:25 +01:00
Jacek Jendrzej
a05d03b02c movieplayer dont chache last realurl for lua script 
Origin commit data
------------------
Commit: e111bf7418
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)
 2017-01-26 11:55:06 +01:00
vanhofen
c84c215ac5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:48:39 +01:00
Stefan Seyfried
bff69630e4 driver: use newer ffmpeg API 
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Commit: 7154f36258
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-13 01:44:45 +01:00
vanhofen
d44f98a01d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: cb9b4b1d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:34:20 +01:00
Stefan Seyfried
a40212a5eb driver: use newer ffmpeg API 
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Commit: 4a400c909a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 22:16:42 +01:00
vanhofen
280b559852 fix last merge 
Origin commit data
------------------
Commit: 4bbfbe997b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- fix last merge
 2016-10-25 13:15:57 +02:00
vanhofen
ee5ff0408d 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
------------------
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 13:08:01 +02:00
vanhofen
ca02e09411 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 12:30:10 +02:00
vanhofen
9eae77e776 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)
 2016-10-24 10:06:31 +02:00
Stefan Seyfried
0f962fef46 record, streamts: use modern AV_CODEC_ID enums 
this allows to build with current ffmpeg


Origin commit data
------------------
Commit: 5bf115db80
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-24 09:45:23 +02:00
Stefan Seyfried
6213d1279e record, streamts: use modern AV_CODEC_ID enums 
this allows to build with current ffmpeg


Origin commit data
------------------
Commit: 5f33ee96fd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 12:02:10 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
7433978a1c Merge branch 'ni/cst-next' into ni/mp/cst-next 
Origin commit data
------------------
Commit: 0d035edb33
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 11:59:40 +02:00
vanhofen
22a31dccd6 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: f69fdc425b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
 2016-09-29 11:59:21 +02:00
vanhofen
9fec447ce7 streamts: fix -Wformat warning 
Origin commit data
------------------
Commit: f45d4d2bd5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)

Origin message was:
------------------
- streamts: fix -Wformat warning
 2016-09-29 10:53:06 +02:00
vanhofen
bc33663742 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
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
6192e893ab Fix merge conflicts 
Origin commit data
------------------
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-20 09:01:33 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
TangoCash
5a9f231ed3 add support for H265 
Origin commit data
------------------
Commit: 0d8986b09d
Author: TangoCash <eric@loxat.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)
 2016-07-31 21:28:53 +02:00
Jacek Jendrzej
adb7c0e670 src/driver/streamts.cpp try to fix send err loop 
Origin commit data
------------------
Commit: ed02b4c81e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-11 (Mon, 11 Apr 2016)
 2016-04-11 12:48:09 +02:00
Jacek Jendrzej
2062685a97 src/driver/streamts.cpp check after new 
Origin commit data
------------------
Commit: b526c2480c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-10 (Sun, 10 Apr 2016)
 2016-04-10 19:42:39 +02:00
Jacek Jendrzej
fb0eacff9b add av_dict_free, fix memleak 
Origin commit data
------------------
Commit: a830d0d587
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-04-04 15:38:51 +02:00
Jacek Jendrzej
c91dd80565 add headers ffmpeg option for luascript bg play; use in script 'entry['header'] = 'Cookie: var=name'; 
Origin commit data
------------------
Commit: a61b8de691
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-25 (Fri, 25 Mar 2016)
 2016-03-25 17:16:54 +01:00
[CST] Focus
33b04e8427 driver/record.cpp, driver/streamts.cpp: ignore bitstream filter errors 
Origin commit data
------------------
Commit: 59c4b42376
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-21 (Mon, 21 Mar 2016)
 2016-03-21 13:44:43 +03:00
Jacek Jendrzej
db2aae6723 src/driver/streamts.cpp init bsfc, fix possible segfault 
Origin commit data
------------------
Commit: 2adcd8b5d6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)
 2016-03-12 16:13:22 +01:00
[CST] Focus
007207bc87 driver/record.cpp, driver/streamts.cpp: add more formats, for testing 
Origin commit data
------------------
Commit: f3a2657c9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)
 2016-03-12 14:53:11 +03:00
[CST] Focus
43f91c0db9 driver/streamts.cpp: fix webtv streaming for live urls via lua plugins 
Origin commit data
------------------
Commit: a19083f60d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)
 2016-03-04 13:04:34 +03:00
Jacek Jendrzej
192e734f6b (performance) Prefer prefix ++/-- operators for non-primitive types 
Origin commit data
------------------
Commit: 7db16952f6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)
 2016-02-16 13:02:10 +01:00
[CST] Focus
9a6f35757f driver/streamts.cpp: fix webtv stream open 
Origin commit data
------------------
Commit: 97d7dc2e6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)
 2016-02-05 19:27:31 +03:00
[CST] Focus
9f386f68fe driver/streamts.cpp: add webtv channels streaming for compatible streams 
Origin commit data
------------------
Commit: c13eb939fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-05 (Fri, 05 Feb 2016)
 2016-02-05 18:57:42 +03:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
[CST] Focus
d4a05c7c3b driver/streamts.cpp: bug fix: SO_SNDBUF for connection fd 
Origin commit data
------------------
Commit: 5a000b6a4e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-09-24 (Thu, 24 Sep 2015)
 2015-09-24 13:32:38 +03:00
Stefan Seyfried
4c9e098a4f set threadnames to unique values 
Origin commit data
------------------
Commit: fca14b17c5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-28 (Sat, 28 Feb 2015)
 2015-02-28 10:53:18 +01:00
Stefan Seyfried
ec1a9fce17 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
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
[CST] Focus
8f7f3f9e4d webtv channels integration port, 
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
 2014-08-27 17:32:26 +04:00
Jacek Jendrzej
782e666f68 add h265 to record and stream 
Origin commit data
------------------
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
 2014-05-29 16:23:36 +02:00
Stefan Seyfried
b380c76a2e streamts: fix format-string warnings 
Origin commit data
------------------
Commit: 1a8f4de81e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:26:51 +02:00
Stefan Seyfried
3f36062fe7 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
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
Jacek Jendrzej
b5ad1dc8b1 streamts.cpp StreamInstance::Send: do not block neutrino by faulty stream 
Origin commit data
------------------
Commit: c170b03b9a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-07 (Mon, 07 Apr 2014)
 2014-04-07 16:01:27 +02:00
[CST] Focus
c9cf5b48b3 driver/streamts.cpp: optimize poll timeout, cancel thread on stop 
Origin commit data
------------------
Commit: b96a7d43a6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)
 2014-03-27 18:56:49 +04:00