mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 08:53:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,851 Commits 2 Branches 9 Tags
f6c0718366f140d73234ebb5672e9de222a3d58f
Commit Graph

19 Commits

Author SHA1 Message Date
Stefan Seyfried
f6c0718366 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
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Stefan Seyfried
ad36c2d22d remove unneeded libpng version checks 
Origin commit data
------------------
Commit: 23ec489390
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-01 (Wed, 01 May 2013)
 2013-05-01 16:37:58 +02:00
[CST] Focus
6ffcc3c977 driver/screenshot.cpp: re-enable StartSync() code 
Origin commit data
------------------
Commit: baa698c1b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-19 (Tue, 19 Mar 2013)
 2013-03-19 17:23:45 +04:00
Stefan Seyfried
3239bce22d screenshot: fix invalid cast in debug message 
Origin commit data
------------------
Commit: 2f30a63a6b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
 2013-03-12 16:32:02 +04:00
Stefan Seyfried
0a761f665e screenshot: fix invalid cast in debug message 
Origin commit data
------------------
Commit: 598361c2a1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
 2013-03-09 18:21:36 +01:00
[CST] Focus
35e328aad2 driver/screenshot.cpp: ifdef for png_set_invert_alpha 
Origin commit data
------------------
Commit: 27fd5a7105
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-05 (Tue, 05 Mar 2013)
 2013-03-05 18:33:01 +04:00
Stefan Seyfried
f2e855b7ef neutrino: enable screenshots 
Origin commit data
------------------
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
 2013-01-13 18:49:37 +01:00
[CST] Focus
68fa8045e2 src/driver/screenshot.cpp: enable png alpha invert 
Origin commit data
------------------
Commit: c81c18f387
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
 2012-12-12 11:33:51 +04:00
[CST] Focus
934e6b8c33 remove channel_id mask for CEitManager getXXX calls 
Origin commit data
------------------
Commit: 3f5a0e5bb1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
 2012-08-30 14:50:01 +04:00
[CST] Focus
8ec523e8cc use CEitManager to get EIT data 
Origin commit data
------------------
Commit: 74a761ef50
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
 2012-08-30 11:40:02 +04:00
Jacek Jendrzej
41e57ce7bc comment out never used 
Origin commit data
------------------
Commit: 9124c20f31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)
 2012-08-04 10:03:19 +02:00
[CST] Focus
fd182a1963 driver/screenshot.cpp: use CServiceManager to get channel name 
Origin commit data
------------------
Commit: 25ee18e1e1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)
 2012-04-10 16:03:23 +04:00
Jacek Jendrzej
76055c4430 screenshot: -fix if no video 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2118 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 5235d99b31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-02-22 (Wed, 22 Feb 2012)
 2012-02-22 15:23:41 +00:00
Jacek Jendrzej
4263592739 add settings menu screenshot 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2113 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 382ec004ab
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-02-18 (Sat, 18 Feb 2012)

Origin message was:
------------------
-add settings menu screenshot

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2113 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-18 17:16:30 +00:00
[CST] Focus
a46b44fba4 Enable screenshots; handle screenshot key in streaminfo 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2091 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 013ce5ce28
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-15 (Wed, 15 Feb 2012)
 2012-02-15 13:34:07 +00:00
Jacek Jendrzej
66c9fac240 fix memory leak 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2070 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: df378158ca
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-01-20 (Fri, 20 Jan 2012)

Origin message was:
------------------
-fix memory leak

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2070 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-20 17:15:04 +00:00
[CST] Focus
bb5fe42497 screenshot: add bmp format and options to dump fb and scale 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2054 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 14bb685b1e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-12 (Thu, 12 Jan 2012)
 2012-01-12 15:14:46 +00:00
gixxpunk
40f7d6dad0 screenshot.cpp: fix compile with newer libpng versions 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2049 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: de37c3fa3b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-01-08 (Sun, 08 Jan 2012)

Origin message was:
------------------
- screenshot.cpp: fix compile with newer libpng versions

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2049 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-08 12:11:15 +00:00
[CST] Focus
72ac047164 New experimental feature for saving live screenshot images, disabled until lib/driver updated 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2041 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: ef812396ca
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-08 (Sun, 08 Jan 2012)
 2012-01-08 10:29:52 +00:00