Commit Graph

14 Commits

Author SHA1 Message Date
Stefan Seyfried
6a04931cb7 Makefiles: simplify includes for libcoolstream/libstb-hal
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a728f9ee1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-11 (Mon, 11 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-11 21:51:08 +01:00
Stefan Seyfried
971d575b78 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
Michael Liebmann
ec6bf71c64 Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5091e920fc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-17 04:22:49 +02:00
Stefan Seyfried
083bc55347 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
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
Stefan Seyfried
9fc6c24a21 remove obsolete embedded libtriple
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead


Origin commit data
------------------
Branch: ni/coolstream
Commit: d2d8218885
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-06 (Wed, 06 Mar 2013)



------------------
This commit was generated by Migit
2013-03-06 17:23:46 +01:00
[CST] Focus
46f1deca39 Makefiles.am: add conditional include for libcoolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3d2efe475
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-11 14:17:16 +04:00
Stefan Seyfried
3df9a6f7f5 Merge branch 'uncool/dvbsi++' commit '9d968280bac'
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
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
2012-07-23 01:02:29 +02:00
Michael Liebmann
0ce6e40d80 Add missing $(top_builddir) to Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: f36ee26d87
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-22 (Sun, 22 Apr 2012)

Origin message was:
------------------
* Add missing $(top_builddir) to Makefile.am

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-04-27 16:54:01 +01:00
Stefan Seyfried
e0bff04727 libneutrino-hal is now libstb-hal
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f5e4238cc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-11 (Sat, 11 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-04-17 19:33:52 +02:00
Stefan Seyfried
79ebbf08b4 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
------------------
Branch: ni/coolstream
Commit: c8a561244e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-03 (Fri, 03 Feb 2012)



------------------
This commit was generated by Migit
2012-04-17 19:33:52 +02:00
[CST] Bas
4aec6c4fec lib: fix compile after include change.
Origin commit data
------------------
Branch: ni/coolstream
Commit: b04b3f270a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-03-04 15:53:33 +08:00
Stefan Seyfried
1ca74c99b4 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
------------------
Branch: ni/coolstream
Commit: 2590adfe15
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-12-25 (Sat, 25 Dec 2010)



------------------
This commit was generated by Migit
2010-12-25 17:43:28 +00:00
[CST] Focus
117e87ab2d 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
------------------
Branch: ni/coolstream
Commit: 83e422bfea
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-11 (Mon, 11 Jan 2010)



------------------
This commit was generated by Migit
2010-01-11 20:03:38 +00:00
mrcolor
bcecfb6585 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
------------------
Branch: ni/coolstream
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)



------------------
This commit was generated by Migit
2009-12-08 11:05:11 +00:00