Commit Graph

546 Commits

Author SHA1 Message Date
svenhoefer
f9515444f0 - libconfigfile: allow configfiles with another delimiter as '=' 2013-11-08 15:06:05 +01:00
Stefan Seyfried
831fff71f3 update lcddisplay and libcoolstream to AM_CPPFLAGS 2013-11-03 02:07:51 +01:00
[CST] Focus
7f01a5740d add libiw to build 2013-11-01 16:43:06 +04:00
[CST] Focus
9a40a9f740 lib/libiw: add libiw from wireless tools v29, and wrapper to scan wlan networks 2013-11-01 16:43:06 +04:00
Stefan Seyfried
d244a5991a Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
2013-10-21 22:58:55 +02:00
striper
b2c37c556f - tuxtxt: pageinfo = NULL 2013-10-20 21:07:59 +02:00
Michael Liebmann
5091e920fc Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am 2013-10-17 04:22:49 +02:00
Stefan Seyfried
f485bceff7 initialize variables (mostly to silence valgrind)
Signed-off-by: Thilo Graf <dbt@novatux.de>
2013-10-01 14:00:20 +02:00
Stefan Seyfried
e1e4a0f3a0 initialize variables (mostly to silence valgrind) 2013-09-30 20:50:31 +02:00
Stefan Seyfried
c68ffa2155 remove all fb->blit() calls
TODO: check if plugins etc. need extra treatment
2013-09-28 13:01:03 +02:00
[CST] Focus
381e59a54f lib/libupnpclient/UPNPDevice.cpp: change to non-blocking recv 2013-09-09 12:42:01 +04:00
[CST] Focus
c2a11f6dd2 lib/libcoolstream/playback_cs.h: update apollo header 2013-09-03 18:38:01 +04:00
[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 - at least with uclibc it refuse to save
conf file which not exist
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