Stefan Seyfried
d5d5a60261
Merge branch 'check/next-cc'
...
it compiles, but is not really tested...
Conflicts:
src/driver/netfile.cpp
src/driver/volume.cpp
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/bedit/bouqueteditor_bouquets.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bookmarkmanager.cpp
src/gui/bouquetlist.cpp
src/gui/eventlist.cpp
src/gui/movieplayer.cpp
src/gui/pictureviewer.cpp
src/gui/scan.cpp
src/gui/test_menu.h
src/gui/timerlist.cpp
src/gui/update.cpp
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/zapit/src/Makefile.am
src/zapit/src/femanager.cpp
2013-06-16 21:22:14 +02:00
[CST] Focus
6f8ef9ec46
Merge branch 'next' into next-cc
...
Conflicts:
data/locale/english.locale
src/driver/framebuffer.cpp
src/gui/channellist.cpp
src/gui/eventlist.cpp
src/gui/moviebrowser.cpp
2013-06-02 10:46:42 +04:00
[CST] Focus
f4aa8a0d12
gui/movieinfo.cpp: add fields for youtube feeds player
2013-05-30 09:59:10 +04:00
Stefan Seyfried
a7f1e0e25e
Merge remote-tracking branch 'check/next-cc'
...
needs buildfixing in framebuffer class...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/driver/fontrenderer.cpp
src/driver/volume.cpp
src/gui/audiomute.cpp
src/gui/audioplayer.cpp
src/gui/osd_setup.cpp
src/gui/widget/stringinput.cpp
src/neutrino.cpp
2013-05-24 20:24:39 +02:00
rhabarber1848
99221ee19c
Neutrino Movieinfo: show genre, patch by Gaucho316: http://www.dbox2-tuning.net/forum/viewtopic.php?p=384587#p384587
2013-05-23 22:03:43 +02:00
rhabarber1848
995aeaeb18
Neutrino: Remove trailing comma in movieinfo`s audio track listing, patch by Gaucho316: http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=49186
2013-05-23 21:30:56 +02:00
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
Jacek Jendrzej
b386f7bbd2
use var passed by reference
...
Conflicts:
src/gui/components/cc_frm.h
src/gui/components/cc_frm_icons.cpp
2013-04-30 12:59:25 +04:00
Jacek Jendrzej
ddc9229efc
use var passed by reference
2013-04-18 19:19:30 +02:00
Stefan Seyfried
4dbeb3a31e
neutrino: fix 32<->64bit format string warnings
...
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
2013-02-21 15:47:18 +01:00
Stefan Seyfried
e0acbd3ddb
neutrino: fix 32<->64bit format string warnings
...
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
2012-11-03 14:05:48 +01:00
Stefan Seyfried
adb23b23ee
Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...
...needs buildfixing...
Conflicts:
data/icons/shutdown.jpg
data/icons/start.jpg
lib/libtuxtxt/tuxtxt.h
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/framebuffer.cpp
src/driver/record.cpp
src/driver/volume.cpp
src/gui/audio_setup.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/infoviewer.cpp
src/gui/keybind_setup.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.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/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/system/Makefile.am
src/system/configure_network.cpp
src/system/httptool.cpp
src/system/setting_helpers.cpp
src/timerd/timermanager.cpp
src/zapit/include/zapit/frontend_c.h
src/zapit/src/Makefile.am
src/zapit/src/capmt.cpp
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
2012-10-14 12:51:07 +02:00
Stefan Seyfried
d806eeb544
fixes for 64bit archs: don't assume a pointer is 32bit wide
2012-10-07 17:09:17 +02:00
svenhoefer
2133b25783
- movieinfo: supplement to fb8a993e77
...
re-insert the wrong <qualitiy>-tag to keep compatibility
but this tag will not longer be written into xml-files.
2012-09-24 11:26:42 +02:00
Thilo Graf
d1f22aa20c
*includes: add global.h
2012-08-21 09:48:22 +01:00
[CST] Focus
7d723aa44f
gui/movieinfo.cpp: fix channel id loading
2012-08-16 15:47:24 +04:00
satbaby
7359504dd7
-fixes strncpy & buf size
2012-08-07 18:51:44 +02:00
satbaby
9124c20f31
comment out never used
2012-08-04 10:03:19 +02:00
satbaby
060c1c45b2
fix gcc 4.7.x warnings
2012-07-07 13:09:08 +02:00
satbaby
bc574e9688
use empty() instead of size()
2012-06-16 09:44:42 +02:00
striper
63418c7a1b
- movieinfo
...
Encode and decode special chars properly.
Patch by Gaucho316.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2158 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-23 17:13:52 +00:00
satbaby
2591100c42
remove never used volues
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2138 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-04 17:25:48 +00:00
satbaby
efd283ae1e
fix errors
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@195 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-01-20 18:54:51 +00:00
seife
8070a9613d
fix up libxmltree interfaces, so that useless casts can be removed
...
Lots of places hat casts from (const char*) to (char *) to silence
a "deprecated conversion" warning. Instead of casting (which is
inherently wrong), fix up the libxmltree interfaces.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@117 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-22 16:11:40 +00:00
mws
1b13da2617
Mark unused vars as comment
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-21 16:23:09 +00:00
mrcolor
bc5bd4154e
our current experimental Neutrino branch
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-08 11:05:11 +00:00
