[CST] Focus
3498577460
lib/libcoolstream2/playback_cs.h: update apollo header
2013-09-03 18:23:20 +04:00
[CST] Focus
418588e14a
lib/libupnpclient/UPNPDevice.cpp: fix fd leak
2013-09-03 18:23:20 +04:00
Stefan Seyfried
32de6beef0
Merge remote-tracking branch 'check/next-cc'
...
needs buildfixing...
Conflicts:
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/infoclock.cpp
src/gui/infoviewer.cpp
src/gui/motorcontrol.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/widget/progresswindow.cpp
src/gui/widget/textbox.cpp
src/neutrino.cpp
src/zapit/include/zapit/femanager.h
2013-09-01 19:46:10 +02:00
Michael Liebmann
381d25bdcd
Fix file include in apollo libcoolstream headers
2013-08-17 20:56:26 +02:00
[CST] Focus
7a41572563
revert apollo libcoolstream headers to release lib version
2013-08-06 15:16:48 +04:00
[CST] Focus
c337d26f99
lib/libcoolstream2: headers update
2013-07-18 14:52:00 +04:00
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
5ed5b6d200
lib/sectionsdclient: add EVT_EIT_COMPLETE event,
...
add demux number to setServiceChanged()
2013-06-12 18:46:33 +04: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
Stefan Seyfried
31d0b88ca1
dvbsubtitle: add missing blit()
2013-06-01 17:17:28 +02:00
[CST] Focus
83c7de004e
lib/libcoolstream/playback_cs.h: new header
2013-05-30 10:24:46 +04:00
Jacek Jendrzej
a549b97924
fix comma at end of enumerator list
2013-05-28 15:52:31 +02:00
Stefan Seyfried
c4d700b463
xmltok: add hack to rename functions
...
this avoids crashes due to clashes with libexpat,
which might be pulled in dynamically e.g. on PC by libGL.
2013-05-28 14:23:17 +02:00
Michael Liebmann
de4996228f
* dvbsubtitle: Fix segfault in destructor
2013-05-10 17:09:06 +04:00
[CST] Focus
e0898de5ca
sync apollo libcs headers
2013-05-10 16:34:48 +04: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
Michael Liebmann
1fb105b361
* dvbsubtitle: Fix segfault in destructor
2013-05-04 18:20:52 +01: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
[CST] Focus
a780c07815
libcoolstream2/playback_cs.h: sync header
2013-04-30 12:48:24 +04:00
Jacek Jendrzej
ddc9229efc
use var passed by reference
2013-04-18 19:19:30 +02:00
Stefan Seyfried
227bf9f2e8
dvbsubtitle: free avcodec context in destructor
2013-04-05 15:54:12 +04:00
[CST] Focus
50fe74f9c1
lib/libcoolstream2/video_cs.h: add 1080p 50/60 modes
2013-03-28 15:41:01 +04:00
Stefan Seyfried
a0c277eaac
libnet: avoid type-punning compiler warning
2013-03-24 17:02:44 +01:00
Stefan Seyfried
c4065cb778
libmd5sum: fix strict-aliasing warning
2013-03-24 13:13:30 +01:00
[CST] Focus
138160ae4f
libcoolstream/ca_cs.h: sync header
2013-03-08 17:56:03 +04:00
[CST] Focus
30d650999d
lib/libcoolstream/video_cs.h: sync header
2013-03-08 17:33:28 +04:00
[CST] Focus
9dcf32cdd2
libconfigfile/configfile.cpp: fix typo while merging
2013-03-07 17:20:53 +04:00
[CST] Focus
aa60c85768
Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next
...
Conflicts:
lib/libconfigfile/configfile.cpp
src/system/setting_helpers.cpp
src/zapit/src/femanager.cpp
2013-03-07 17:10:57 +04:00
Stefan Seyfried
d2d8218885
remove obsolete embedded libtriple
...
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
2013-03-06 17:23:46 +01:00
Stefan Seyfried
ec58530ae4
libconfigfile: fix strange problem in last commit
...
for unexplained reasons, tmpfile was sometimes empty :-(
to work around that, use std::string instead of const char *
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
2013-03-05 11:05:47 +01:00
Stefan Seyfried
2afc06a793
libconfigfile: update config file atomically when saving
...
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
2013-03-05 11:05:38 +01:00
Stefan Seyfried
478d59dd2f
libconfigfile: fix strange problem in last commit
...
for unexplained reasons, tmpfile was sometimes empty :-(
to work around that, use std::string instead of const char *
2013-03-03 23:40:33 +01:00
Stefan Seyfried
f3d896a949
libconfigfile: update config file atomically when saving
2013-03-03 23:04:54 +01:00
[CST] Focus
a0aeffb5ad
lib/libconfigfile/configfile.cpp:
...
fix 804bed4e73
2013-03-01 08:31:21 +04:00
[CST] Focus
026592e8fe
Merge branch 'dvbsi++' into next
...
Conflicts:
src/neutrino.cpp
src/zapit/src/femanager.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
2013-02-28 16:39:34 +04:00
[CST] Focus
af5ead9f3f
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
2013-02-26 11:17:18 +04:00
Stefan Seyfried
804bed4e73
configfile: don't do a full sync() after saving
2013-02-24 14:03:34 +01:00
Stefan Seyfried
809db6211e
configfile: reset modified flag after saving
2013-02-24 14:03:23 +01:00
Stefan Seyfried
07a8027b4d
configfile: set the modified flag correctly on set*Vector methods
2013-02-24 14:03:11 +01:00
Stefan Seyfried
a5ccbbbd40
configfile: don't do a full sync() after saving
2013-02-23 15:42:22 +01:00
Stefan Seyfried
5aca39874b
configfile: reset modified flag after saving
2013-02-23 15:36:02 +01:00
Stefan Seyfried
593871bf0f
configfile: set the modified flag correctly on set*Vector methods
2013-02-23 15:34:47 +01:00
[CST] Focus
81cf9c7afc
libcoolstream2/dmx_cs.h: update header
2013-02-13 14:09:47 +04:00
[CST] Focus
ca3ac51881
lib/libcoolstream2: sync control headers
2013-01-18 16:53:40 +04:00
[CST] Focus
60b5c40d14
lib/libcoolstream2/video_cs.h: update apollo header
2013-01-16 16:35:38 +04:00
Stefan Seyfried
a5ed005ff8
neutrino: enable screenshots
2013-01-13 18:49:37 +01:00
Stefan Seyfried
dbf7f9719b
tuxtxt: fix topmenu for small OSD borders
2013-01-13 17:36:41 +01:00
[CST] Focus
d3e2a2bdd0
add libcoolstream/cs_frontpanel.h copy
2013-01-11 15:14:12 +04:00
[CST] Focus
1db9531bdc
Merge branch 'dvbsi++' into next
2013-01-11 14:21:44 +04:00
[CST] Focus
d3d2efe475
Makefiles.am: add conditional include for libcoolstream
2013-01-11 14:17:16 +04:00
