mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,544 Commits 1 Branch 51 Tags
7e23ac7223b9ded8d3fc8b63b07889a76c2e9158
Commit Graph

36 Commits

Author SHA1 Message Date
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
 2012-11-03 10:45:33 +01:00
satbaby
5428d36da4 unused funktions 2012-10-14 17:05:43 +02: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
Stefan Seyfried
d806eeb544 fixes for 64bit archs: don't assume a pointer is 32bit wide 2012-10-07 17:09:17 +02:00
Stefan Seyfried
25446f7408 get rid of NEW_CURL hack, this API is long obsolete 2012-10-06 17:29:09 +02:00
satbaby
86632f0369 if curl version 2012-09-12 18:28:11 +02:00
satbaby
3389defb17 start SCRIPTs with-my_system 2012-09-11 20:33:34 +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
satbaby
060c1c45b2 fix gcc 4.7.x warnings 2012-07-07 13:09:08 +02:00
[CST] Focus
5dd54caf54 fix conflict 2012-06-18 14:56:17 +04:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
[CST] Focus
35ee04049a remove obsolete and unused includes 2012-06-14 11:01:37 +04:00
Stefan Seyfried
a029333c1a neutrino: adapt to the framebuffer_spark blitter change 
basically add fb->blit() in every widget where necessary to
make sure the framebuffer is updated with current content
 2012-04-17 19:33:57 +02:00
Stefan Seyfried
2f65aea744 neutrino: make button bar use available space intelligently 
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Attention: This code is GPL v3+ only for now!
 2012-04-17 19:33:49 +02:00
striper
9b0cff51d6 - filebrowser: proper fix for small paint error with rounded corners 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1767 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-10-21 10:11:15 +00:00
thilo
7a94675d57 *neutrino filebrowser: fix small paint error during first paint 
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p134807-anzeige-bug/#post134807

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1759 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-10-19 08:55:20 +00:00
striper
0b80855c4d - fix compilation with libcurl >= 7.21.7 
Long time deprecated <curl/types.h> was completely removed in libcurl 7.21.7. If CST also uses newer libcurl <curl/types.h> defines can savely be removed.
Until then use "-DNEW_LIBCURL" for libcurl >= 7.21.7.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1560 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-04 10:03:09 +00:00
seife
61573462c8 filebrowser: improve display of long paths 
If a directory is too long to be displayed, the last
part of it is probably more interesting than the first.
A likely overflow is prevented by using asprintf instead
of a static buffer

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1483 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-22 16:25:20 +00:00
thilo
e1f887af72 *neutrino buttonbars: reworked painting of buttonbar in 
channellist,
stringinput (also cleared some char format problems),
audioplayer,
bouqueteditor_bouqets,
bouqueteditor_channels,
bouqueteditor_chanselect,
bookmarkmanager,,
bouquetlist,
filebrowser,
epgplus,
epgview,
pictureviewer,
timerlist,
upnpbrowser

TODO:
This is still not a final solution. I would like to see buttonhandling in
own class for better integration and handling of window structure.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1179 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-21 09:08:10 +00:00
satbaby
e89575213f -add shoutcast dev id to neutrino.conf, no menu now 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1107 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-03 09:42:39 +00:00
striper
a2a9c99145 - small fix (thx snafed!) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1105 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-02 18:53:11 +00:00
striper
875fc958f7 - update shoutcast API to Version 2.0 and disable shoutcast menu entry until cs-tech gets a proper shoutcast dev-id 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1104 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-02 18:51:58 +00:00
thilo
bf20bb63b8 *neutrino clean up: Streaming settings removed 
- from all locales,
	locales.h,
	locales_intern.h
- usage of settings in
	filebrowser.cpp,
	movieplayer.cpp,
	neutrino.cpp,
	neutrino.h,
	neutrino_menue.cpp,
	setting_helpers.cpp,
	setting_helpers.h,
	settings.h
There is no reason to keep dead features,
but if we need streaming settings sometime in future again,
then we can dig out it.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1076 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-28 08:44:46 +00:00
satbaby
a302018803 -add chooserDir function 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1032 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-18 06:56:53 +00:00
satbaby
ccce208d2d small help icon 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@695 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-07-31 14:17:16 +00:00
satbaby
8c8c45e06a scale fixes 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@674 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-07-16 09:42:48 +00:00
satbaby
249352e5dc osd fixes 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@668 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-07-15 11:04:22 +00:00
satbaby
072409f0c9 -fix center txt 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@666 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-07-14 09:13:47 +00:00
focus
56674d5561 Fixes for non-standart icon sizes. Not complete yet, work in progress. Probably will broke commit #568 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@569 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-06 09:39:29 +00:00
focus
55956cf728 Disable return root dir 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@425 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-26 17:30:56 +00:00
satbaby
24c8d684c9 fix rc favorites 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@405 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-24 13:40:20 +00:00
satbaby
8f59cc96ec change 'long long' tom int64_t'; change variable buf to new delete; 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-07 14:32:21 +00:00
focus
95130dee5a All icon file names moved to icons.h; .raw extension removed from icon names 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@219 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-29 14:09:57 +00:00
seife
8070a9613d fix up libxmltree interfaces, so that useless casts can be removed 
Lots of places hat casts from (const char*) to (char *) to silence
a "deprecated conversion" warning. Instead of casting (which is
inherently wrong), fix up the libxmltree interfaces.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@117 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-22 16:11:40 +00:00
seife
83d7657b9d neutrino: fix crashes on invalid fonts 
with the latest fontrenderer fix, invalid fonts now can lead to
division by zero errors. fix the occurences I found.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@43 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-13 12:25:38 +00:00
mrcolor
bc5bd4154e our current experimental Neutrino branch 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-08 11:05:11 +00:00