Stefan Seyfried
|
8253c4d67c
|
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
|
2013-05-10 10:06:47 +02:00 |
|
Stefan Seyfried
|
23ec489390
|
remove unneeded libpng version checks
|
2013-05-01 16:37:58 +02:00 |
|
[CST] Focus
|
baa698c1b8
|
driver/screenshot.cpp: re-enable StartSync() code
|
2013-03-19 17:23:45 +04:00 |
|
Stefan Seyfried
|
2f30a63a6b
|
screenshot: fix invalid cast in debug message
|
2013-03-12 16:32:02 +04:00 |
|
Stefan Seyfried
|
598361c2a1
|
screenshot: fix invalid cast in debug message
|
2013-03-09 18:21:36 +01:00 |
|
[CST] Focus
|
27fd5a7105
|
driver/screenshot.cpp: ifdef for png_set_invert_alpha
|
2013-03-05 18:33:01 +04:00 |
|
Stefan Seyfried
|
a5ed005ff8
|
neutrino: enable screenshots
|
2013-01-13 18:49:37 +01:00 |
|
[CST] Focus
|
c81c18f387
|
src/driver/screenshot.cpp: enable png alpha invert
|
2012-12-12 11:33:51 +04:00 |
|
[CST] Focus
|
3f5a0e5bb1
|
remove channel_id mask for CEitManager getXXX calls
|
2012-08-30 14:50:01 +04:00 |
|
[CST] Focus
|
74a761ef50
|
use CEitManager to get EIT data
|
2012-08-30 11:40:02 +04:00 |
|
satbaby
|
9124c20f31
|
comment out never used
|
2012-08-04 10:03:19 +02:00 |
|
[CST] Focus
|
25ee18e1e1
|
driver/screenshot.cpp: use CServiceManager to get channel name
|
2012-04-10 16:03:23 +04:00 |
|
satbaby
|
5235d99b31
|
screenshot: -fix if no video
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2118 e54a6e83-5905-42d5-8d5c-058d10e6a962
|
2012-02-22 15:23:41 +00:00 |
|
satbaby
|
382ec004ab
|
-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 |
|
focus
|
013ce5ce28
|
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
|
2012-02-15 13:34:07 +00:00 |
|
satbaby
|
df378158ca
|
-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 |
|
focus
|
14bb685b1e
|
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
|
2012-01-12 15:14:46 +00:00 |
|
striper
|
de37c3fa3b
|
- 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 |
|
focus
|
ef812396ca
|
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
|
2012-01-08 10:29:52 +00:00 |
|