mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,117 Commits 1 Branch 51 Tags
d1eebea38173f2649a84b8c23ddeb44a2370b41b
Commit Graph

81 Commits

Author SHA1 Message Date
Stefan Seyfried
3a728f9ee1 Makefiles: simplify includes for libcoolstream/libstb-hal 2013-11-11 21:51:08 +01:00
Stefan Seyfried
f1df21079f tuxtxt: add back the Tripledragon's ttx keys 2013-11-09 18:59:59 +01:00
Stefan Seyfried
e06e845eae tuxtxt: don't try to manipulate input fd 
the CRCInput class is used for input anyway, so
this does not make any sense.
 2013-11-09 18:57:10 +01: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
c68ffa2155 remove all fb->blit() calls 
TODO: check if plugins etc. need extra treatment
 2013-09-28 13:01:03 +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
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
dbf7f9719b tuxtxt: fix topmenu for small OSD borders 2013-01-13 17:36:41 +01:00
[CST] Focus
d3d2efe475 Makefiles.am: add conditional include for libcoolstream 2013-01-11 14:17:16 +04:00
Stefan Seyfried
09e0efb01e tuxtxt: fix width of topmenu box 2013-01-01 22:29:17 +01:00
Stefan Seyfried
475608c594 tuxtxt: fix build on generic pc, don't open framebuffer 2012-11-02 20:06:53 +01:00
Stefan Seyfried
af6881a53c tuxtxt: use neutrino rcinput 2012-11-02 19:11:38 +01:00
Stefan Seyfried
1b5d92ca8a tuxtxt: fix direct access keys in menu 2012-10-31 15:40:40 +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
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
svenhoefer
1e1a3265e6 - tuxtxt: fix creation of /var/tuxbox/config/tuxtxt/ 2012-09-05 23:42:10 +02:00
satbaby
9a889e1496 tuxtxt.h: remove unnecessary header 2012-08-21 14:06:18 +02:00
satbaby
9124c20f31 comment out never used 2012-08-04 10:03:19 +02:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
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
 2012-07-23 01:02:29 +02:00
Stefan Seyfried
ad7c88379a tuxtxt: avoid spurious deadlocks on startup 2012-07-15 13:28:17 +02:00
Stefan Seyfried
cb36c6e712 tuxtxt: make sure that startpage is initialized 
when enabling tuxtxt caching, saving settings and then
starting tuxtxt, the start page was not initialized
 2012-07-15 13:23:52 +02:00
Stefan Seyfried
9af56e1852 tuxtxt: fix race condition in tuxtxt_clear_cache() 
tuxtxt_cache_lock does not prevent from calling tuxtxt_clear_cache
while the cache thread is in the middle of inserting pages, thus
leading to a hard-to-reproduce crash when trying to start up tuxtxt.
The simplest fix is to use an additional "big hammer" lock arond
the whole critical area. Since tuxtxt_clear_cache is only called
very seldom, there should be no lock contention problem.
 2012-07-15 13:19:44 +02:00
Stefan Seyfried
2541edc918 neutrino: first preliminary support for AZbox ME 
this is very experimental and depends on more fixes in
libstb-hal, but audio / video / OSD are basically working
 2012-06-27 21:18:19 +02:00
micha-bbg
f36ee26d87 * Add missing $(top_builddir) to Makefile.am 2012-04-27 16:54:01 +01:00
Stefan Seyfried
20f20c8511 spark: fix transparent icon blitting 
no, the CFrameBuffer::blit2FB() API is *not* intuitive
(transp == true means: no transparency...)
 2012-04-17 19:33:59 +02:00
Stefan Seyfried
33c5da3515 tuxtxt: adapt to framebuffer blitting changes 2012-04-17 19:33:58 +02:00
Stefan Seyfried
99952cb9d7 tuxtxt: fix display with scaling FB, use hw accel if available 
* Use a separate framebuffer and backbuffer on SPARK (the framebuffer
  is not big enough to have both buffers in it).
* make tuxtxt work correctly with scaling FB (1080 full-HD modes)
* improve performance by using the blitter to copy from back- to frame
  buffer if available (spark)
 2012-04-17 19:33:55 +02:00
Stefan Seyfried
6f5e4238cc libneutrino-hal is now libstb-hal 2012-04-17 19:33:52 +02:00
Stefan Seyfried
c8a561244e 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.
 2012-04-17 19:33:52 +02:00
Stefan Seyfried
50a041083f tuxtxt: fix spurious segfault on repeated start 2012-04-17 19:33:51 +02:00
[CST] Bas
ce9eb10ed0 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup 
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIsections.cpp
	src/eitd/dmx.cpp
	src/eitd/dmxapi.cpp
 2012-03-08 12:17:03 +08: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
[CST] Bas
b04b3f270a lib: fix compile after include change. 2012-03-04 15:53:33 +08:00
striper
dc25ebc257 - revert to svn 2126 to stop some people crying 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2132 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-28 08:08:36 +00:00
striper
13b874148d [PATCH] tuxtxt: fix spurious segfault on repeated start 
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Thu, 12 Jan 2012 19:12:08 +0100

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2130 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-27 18:54:07 +00:00
seife
0fa97c1652 neutrino: remove special Tripledragon input handling 
With the new input device, no need for special casing in neutrino.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2052 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-09 20:32:26 +00:00
seife
3259f26dfe tuxtxt: fix config file saving 
tuxtxt does not need the config file, but it needs the *directory*
$(CONFIGDIR)/tuxtxt
Since tuxtxt is no longer standalone, moving the config into main
neutrino.conf would be better, but for now (and in order to not
invalidate all the docs) just create the directory during installation.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1862 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-18 06:56:27 +00:00
focus
54255df7df Clear p26 extended data, possible fix for Norwegian ttx subtitles. patch from Henrik Nilsson 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1847 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-15 08:48:58 +00:00
seife
e69a204e73 neutrino: align tuxtxt defaults with config file 
Let the code use the same defaults as are in the config file,
so that installing the config file is no longer necessary.
This makes for easier packaging of neutrino.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1829 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-05 17:10:03 +00:00
striper
3c98fbaf32 - tuxtxt: fix charset for luxembourg 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1621 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-08-12 08:26:02 +00:00
striper
09a496cdfa - fix compile with kernel headers from new kernels (e.g. 2.6.39.3) 
v4l support has been dropped in recent kernel versions and therefore <linux/videodev.h> is gone. If you want to compile with new kernel headers add -DNEW_CST_KERNEL to your neutrino CFLAGS

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1603 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-27 16:45:58 +00:00
satbaby
2bc765a596 libtuxtxt: compil fix 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1595 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-23 14:08:55 +00:00
satbaby
8ac0295588 Don t touch the tuxtxt_cache structure outside tuxtx & Stop the cache thread since it will be re-initialise. patch by Rattle. THX 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1594 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-23 14:06:52 +00:00
satbaby
bef69b39f3 init variable 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1593 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-23 14:02:33 +00:00
seife
68fc79cf9b tuxtxt: remember current screenmode if exiting from transparent mode 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1485 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-22 16:58:28 +00:00
seife
e9fb741134 fix "converting to non-pointer type 'pthread_t'" compiler warning 
pthread_t is - at least on our platform - not a pointer type, but
basically an int
don't assign NULL but 0 to fix that warning

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1440 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-07 09:06:03 +00:00
nightshad
d26267a541 A multiple of whitespace / indent fixes. 
Move the cache lock up to the allocator of the cache pages. There is
a possible race between tuxtxt_allocate_page and tuxtxt_clear_pages.

One customer reported repeated crashes while zapping. Debugging the core dump
lead me to believe there is a race going on as the variables appeared to have been
erased while it was allocating a page, and in the end crashing on an unallocated
page.





git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1396 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-04-12 09:46:51 +00:00
nightshad
ba51d49bca White space / indent fixes. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1395 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-04-12 09:32:44 +00:00