mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,988 Commits 1 Branch 51 Tags
5f9a39a96b76121e2dbc30f45a9ee015be431379
Commit Graph

494 Commits

Author SHA1 Message Date
Stefan Seyfried
6a955ecef0 fix build / progressbar setup after pu/cc merge 
* CProgressBar::PB_MONO is no longer available
* PB color setup is split over two configuration variables
Fix this while still keeping seamless update compatibility.
 2013-04-06 14:41:06 +02:00
Stefan Seyfried
8b689f4b26 Merge branch 'check/pu-cc' into master 
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
 2013-04-06 14:28:16 +02:00
Stefan Seyfried
5ad0b6b6dc Merge branch 'check/pu-cc' into master 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp
 2013-04-06 11:21:55 +02:00
Stefan Seyfried
27493de2ef neutrino: add the possibility to lock bouquets by default 
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.

Conflicts:
	src/gui/channellist.cpp
 2013-04-05 15:52:58 +04:00
Thilo Graf
860be9a412 CComponents: add progressbar class to cc-items 
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item

TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework
 2013-04-02 09:31:05 +02:00
Jacek Jendrzej
b2241df43d -add record option for teletext & dvbsub pids 2013-04-01 15:07:05 +04:00
[CST] Focus
b1d63cd800 neutrino.cpp: add channellist_numeric_adjust settings variable 2013-04-01 14:13:51 +04:00
[CST] Focus
c17808867f gui/videosettings.cpp: add 1080p 50/60 modes 2013-03-28 15:41:30 +04:00
Stefan Seyfried
8835f4a0c7 Revert "progressbar-menu-tomworld" 
This reverts commit be2966035f.

A better and simpler solution for progressbar setup is already in place.
 2013-03-26 19:17:29 +01:00
Jacek Jendrzej
d9c7739aa6 -add record option for teletext & dvbsub pids 2013-03-19 17:14:04 +01:00
Jacek Jendrzej
369289d179 progressbar-menu-tomworld 2013-03-12 17:27:52 +04:00
Jacek Jendrzej
be2966035f progressbar-menu-tomworld 2013-03-11 14:40:36 +01:00
[CST] Focus
b95859da7c neutrino.cpp: add direct keys to config PiP, swap live and PiP channels 2013-03-08 13:24:53 +04:00
[CST] Focus
c65503bfa0 system/settings.h: add key_pip 2013-02-28 16:19:39 +04:00
Stefan Seyfried
0cf191822a Merge branch 'check/dvbsi++' commit 5db16ee2ff 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2013-02-21 17:07:18 +01:00
[CST] Focus
6174c657a1 Merge branch 'dvbsi++' into next 2013-02-13 15:34:41 +04:00
Jacek Jendrzej
63c66c1f4e add progressbar opt to infobar 2013-02-12 18:03:50 +01:00
tomworld
105c6b4c70 * channellist.cpp: Use extra font for event list 2013-02-12 15:45:27 +01:00
[CST] Focus
58c9c9f884 neutrino.cpp, settings.h: for apollo, add brightness/contrast/saturation 2013-02-12 13:08:33 +04:00
[CST] Focus
46657a1c6b merge dvbsi++ 2013-02-11 13:29:09 +04:00
svenhoefer
d8bd46e9d1 - channellist: make miniTV switchable 2013-02-04 22:25:15 +01:00
[CST] Focus
bcd02435dd Merge branch 'dvbsi++' into next 2013-01-31 17:40:19 +04:00
TangoCash
1a425308ed add optional mini-tv to channellist 
Signed-off-by: satbaby <crashdvb@googlemail.com>
 2013-01-30 19:17:52 +01:00
[CST] Focus
46a2222e5a system/settings.cpp: split cable and sat scan settings 2013-01-16 15:54:51 +04:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
 2012-12-30 21:35:20 +01:00
satbaby
7bebdf91e0 add provider name to infobar , no gui option 2012-12-08 11:15:40 +01:00
Stefan Seyfried
c480e36746 Merge branch 'uncool/dvbsi++' 
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h
 2012-11-11 01:45:22 +01:00
satbaby
a47c6593dc neutrino: -add save epg on stadbyOn/Off option 2012-11-08 13:35:00 +01:00
Thilo Graf
12e778773b *user_menu: personalize also yellow and green buttons 2012-11-05 21:26:19 +01:00
Stefan Seyfried
684e9ce0f4 videosettings: simplify code for different platforms 
make the videomode selection code more dynamic, the future
goal is to get rid of the #ifdefs and select available modes
at runtime
 2012-11-03 23:07:21 +01:00
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
[CST] Focus
b6ad61b0de settings: add option to enable/disable slow record warning 2012-10-16 19:53:47 +04: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
0061aac2b3 fix build for boxtype "generic" 2012-10-07 17:09:17 +02:00
Stefan Seyfried
04ee2e87f3 neutrino: start to use hardware_caps 
Use hardware_caps instead of cs_get_revision() and #ifdef HAVE_FOO_HW
to distinguish between different boxtypes.
 2012-09-23 21:34:47 +02:00
[CST] Focus
8ca988725c system/settings.cpp: add scan_logical_hd option, with 1 as default 2012-07-31 18:16:11 +04:00
micha-bbg
ccd8e39182 * Numeric display volumebar can be switched off. 
- Adjustable via Menu -> Settings -> OSD -> Volumebar digits
 2012-07-23 09:07:10 +01: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
micha-bbg
ee781bd880 * Menu hints: Extra font added 
- Font size set by Menu/Settings/Font settings/Menu/Menu hints
 2012-07-11 23:41:08 +01:00
[CST] Focus
e1c42a376b GUI: add show menu hint option 2012-06-29 20:23:24 +04: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
[CST] Focus
0b23198e56 remove unused emlog setting 2012-06-27 14:37:07 +04:00
[CST] Focus
2448d898a9 remove unused startchanneltv_nr/startchannelradio_nr 2012-06-27 14:31:58 +04:00
[CST] Focus
52150ba7ab system/settings.h: remove unused logo_num 2012-06-27 14:18:42 +04:00
satbaby
041991e0de infoviewer: displaying dd availability is now optional (martii patch adapted by bazi98 ) 2012-06-22 10:30:56 +02:00
micha-bbg
364b323607 * Infoviewer: rework buttonbar 
- add new class 'CInfoViewerBB' (infoviewer_bb.cpp)
- rework paint and calculate icons
- unused icons in the radio mode will not be displayed
- activate 'show resolution = off' in osd setup
- insert 'Display active tuner' in osd setup
 2012-05-19 15:46:37 +01:00
[CST] Focus
3d09ab7e33 gui/miscsettings_menu.cpp: add option to enable/disable persistent channel numbers 2012-04-27 15:35:06 +04:00
satbaby
71832331d0 add: sort channels in allchannel mode 2012-04-24 14:14:42 +02:00
[CST] Focus
ff04a1d594 gui/miscsettings_menu.cpp: add options to create new/removed channel lists 2012-04-22 15:19:19 +04:00
Stefan Seyfried
e4081f44a6 neutrino: add 1080p50 mode on spark 2012-04-17 19:33:59 +02:00