mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 16:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,860 Commits 2 Branches 9 Tags
59c07e5163f6cb3a21a0413d4e44b8b4b910f636
Commit Graph

43 Commits

Author SHA1 Message Date
Thilo Graf
59c07e5163 CScreenShot: fix build 
Some lines were wrong picked


Origin commit data
------------------
Commit: b26fc7fb8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)
 2017-10-29 18:48:28 +01:00
vanhofen
f8d931aad8 add hd51; mostly ported from TangoCash's neutrino-mp 
Origin commit data
------------------
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp
 2017-10-29 18:31:30 +01:00
Jacek Jendrzej
079772e63d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 12:52:04 +02:00
Stefan Seyfried
d41f19b667 add comments to suppres -Wimplicit-fallthrough warnings 
Origin commit data
------------------
Commit: 971f3703a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)
 2017-09-26 12:41:05 +02:00
Jacek Jendrzej
805ed42dc4 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 13:54:04 +02:00
Jacek Jendrzej
0f9284bf91 src/driver/screenshot.cpp avoid memory ranges overlap 
Origin commit data
------------------
Commit: d30bd0ea26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 11:17:36 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 16:20:47 +02:00
Michael Liebmann
9767657185 Merge branch 'pu/fb-setmode' 
Origin commit data
------------------
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:18:01 +02:00
Stefan Seyfried
8193238246 set threadnames to unique values 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5307e62506
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 14:17:12 +02:00
Michael Liebmann
4f9c02f7f6 Merge branch 'master' into pu/fb-setmode 
Conflicts:
 src/driver/screenshot.h
 src/driver/screenshot.cpp
 acinclude.m4


Origin commit data
------------------
Commit: e83a255e95
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
Merge branch 'master' into pu/fb-setmode

Conflicts:
   src/driver/screenshot.h
   src/driver/screenshot.cpp
   acinclude.m4
 2017-03-17 12:43:25 +01:00
Michael Liebmann
ae84cd9cca Merge branch 'master' into pu/mp 
Conflicts:
 src/driver/screenshot.cpp
 src/Makefile.am


Origin commit data
------------------
Commit: 7e4678c6d4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
Merge branch 'master' into pu/mp

Conflicts:
   src/driver/screenshot.cpp
   src/Makefile.am
 2017-03-17 12:34:28 +01:00
Michael Liebmann
c828c5fe12 CScreenShot: Remove OpenThreads and use pthread functions 
Origin commit data
------------------
Commit: ad47a5d5e9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
 2017-03-17 12:19:51 +01:00
TangoCash
317bac3394 Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 81fb3b42fa
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 22:47:42 +01:00
Michael Liebmann
b02e3e871e Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: b190e0c4ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 21:19:08 +01:00
Jacek Jendrzej
41b7873147 screenshot.cpp fix memcpy param overlap 
Origin commit data
------------------
Commit: 142ac1392f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 19:02:44 +01:00
Michael Liebmann
9b16352df5 screenshot: Workaround for broken osd screenshot with new fb driver... 
...and 1280x720 resolution.


Origin commit data
------------------
Commit: 56446c358f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
 2017-02-14 16:21:37 +01:00
Stefan Seyfried
c4cc5e62bb Merge remote-tracking branch 'tuxbox/pu/fb-modules' 
only compile tested ;-)


Origin commit data
------------------
Commit: 2819e651c3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:29:10 +01:00
Michael Liebmann
0e6e6db7bd pu/fb-modules: Rename hardware defined macros for coolstream stb 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 987dbe7f1d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
pu/fb-modules: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
 2017-02-12 09:24:51 +01:00
Michael Liebmann
3b018febe6 Merge branch 'master' into pu/fb-modules 
Origin commit data
------------------
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 09:24:08 +01:00
Michael Liebmann
7e9107c8a8 neutrino: Rename hardware defined macros for coolstream stb 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
 2017-02-12 09:21:04 +01:00
Michael Liebmann
65c62740eb neutrino: Replace USE_NEVIS_GXA with hardware-specific macros 
- Existing USE_NEVIS_GXA definitions in the build system
 (neutrino configure) can be removed.


Origin commit data
------------------
Commit: 02d85f2ff2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
neutrino: Replace USE_NEVIS_GXA with hardware-specific macros

- Existing USE_NEVIS_GXA definitions in the build system
 (neutrino configure) can be removed.
 2017-02-08 06:06:24 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
 2016-12-04 18:02:51 +01:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-10-24 10:31:24 +02: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
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