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: 8253c4d67cseife@tuxbox-git.slipkontur.de >
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 10:06:47 +02:00
Stefan Seyfried
2158fee441
remove obsolete embedded libtriple
...
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead
Origin commit data
------------------
Commit: d2d8218885seife@tuxbox-git.slipkontur.de >
Date: 2013-03-06 (Wed, 06 Mar 2013)
2013-03-06 17:23:46 +01:00
[CST] Focus
542ce7e399
Makefiles.am: add conditional include for libcoolstream
...
Origin commit data
------------------
Commit: d3d2efe475focus.cst@gmail.com >
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 14:17:16 +04:00
Stefan Seyfried
f8a42bcc53
Merge branch 'uncool/dvbsi++' commit '9578e5da35f'
...
This is the last commit before the "menu hints" started.
Needs buildfixing...
Conflicts:
configure.ac
src/daemonc/remotecontrol.cpp
src/daemonc/remotecontrol.h
src/driver/audiodec/basedec.cpp
src/driver/fb_window.cpp
src/driver/rcinput.cpp
src/driver/volume.cpp
src/global.h
src/gui/channellist.cpp
src/gui/eventlist.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/plugins.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/videosettings.cpp
src/gui/widget/buttons.cpp
src/neutrino.cpp
src/sectionsd/dmx.cpp
src/sectionsd/dmxapi.cpp
src/sectionsd/sectionsd.cpp
src/system/setting_helpers.cpp
src/zapit/include/zapit/client/zapittypes.h
src/zapit/include/zapit/frontend_c.h
src/zapit/include/zapit/satconfig.h
src/zapit/include/zapit/scan.h
src/zapit/lib/zapitclient.cpp
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/pmt.cpp
src/zapit/src/scan.cpp
src/zapit/src/sdt.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: ae1b98aa38seife@tuxbox-git.slipkontur.de >
Date: 2012-07-22 (Sun, 22 Jul 2012)
2012-07-23 01:02:29 +02:00
Michael Liebmann
c179cc8762
Add missing $(top_builddir) to Makefile.am
...
Origin commit data
------------------
Commit: f36ee26d87tuxcode.bbg@gmail.com >
Date: 2012-04-22 (Sun, 22 Apr 2012)
Origin message was:
------------------
* Add missing $(top_builddir) to Makefile.am
2012-04-27 16:54:01 +01:00
Stefan Seyfried
f4ca017923
libneutrino-hal is now libstb-hal
...
Origin commit data
------------------
Commit: 6f5e4238ccseife@tuxbox-git.slipkontur.de >
Date: 2012-02-11 (Sat, 11 Feb 2012)
2012-04-17 19:33:52 +02:00
Stefan Seyfried
9dc131a232
enable usage of a separately built replacement of libtriple
...
In order to improve portability, libtriple will be split off and
built separately as "libneutrino-hal" (for hardware abstraction layer)
Enable the makefiles to deal with that.
Origin commit data
------------------
Commit: c8a561244eseife@tuxbox-git.slipkontur.de >
Date: 2012-02-03 (Fri, 03 Feb 2012)
2012-04-17 19:33:52 +02:00
[CST] Bas
97af9ffac9
lib: fix compile after include change.
...
Origin commit data
------------------
Commit: b04b3f270abas@coolstreamtech.com >
Date: 2012-03-04 (Sun, 04 Mar 2012)
2012-03-04 15:53:33 +08:00
Stefan Seyfried
a2135c2c52
add generic dispatcher headers for frontend etc
...
add generic audio, video and demux headers in zapit/include (TODO: put them
into a better place, or put wrappers into lib directories) that automatically
dispatch to the hardware specific functions and use them in the code
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@962 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 2590adfe15seife@tuxbox-git.slipkontur.de >
Date: 2010-12-25 (Sat, 25 Dec 2010)
2010-12-25 17:43:28 +00:00
[CST] Focus
e65ff9eca8
Drop vdr code, use ffmpeg dvb sub decoder. atm patched ffmpeg used
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@153 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 83e422bfeafocus.cst@gmail.com >
Date: 2010-01-11 (Mon, 11 Jan 2010)
2010-01-11 20:03:38 +00:00
mrcolor
cb8dd3394d
our current experimental Neutrino branch
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: bc5bd4154e
2009-12-08 11:05:11 +00:00
