mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,802 Commits 1 Branch 51 Tags
97381edaedc0c83645ef58cb157d7d6018f19040
Commit Graph

55 Commits

Author SHA1 Message Date
redblue-pkt
1b6f4fedf5 update glcd 
Conflicts:
	src/gui/movieplayer.h
	src/gui/weather_locations.h
	src/neutrino.cpp
 2020-06-29 17:34:24 +02:00
svenhoefer
f0240d89a0 - pick graphlcd support from DDT but include it in another way 
Conflicts:
	src/driver/Makefile.am
	src/driver/nglcd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-01-05 16:53:14 +01:00
svenhoefer
8991ed60f4 - pick mipsbox code from DDT, TangoCash and max10 
Conflicts:
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2019-05-05 14:11:39 +02:00
svenhoefer
5c413dce45 - move compatibility headers to /lib/hardware 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2018-12-31 11:47:45 +01:00
TangoCash
b35c344c11 move external volume control to internal volume/mute handler 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2018-10-28 19:41:22 +01:00
Jacek Jendrzej
518ebde76d disable setVolume in standby mode 2017-12-01 10:33:00 +01:00
Jacek Jendrzej
4fc73acffc Merge branch 'master' into pu/mp 2017-09-29 10:49:27 +02:00
svenhoefer
99cc7f850a - rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 2017-09-29 10:34:23 +02:00
Stefan Seyfried
7497722646 Merge remote-tracking branch 'tuxbox/master' 2017-02-01 22:03:40 +01:00
Thilo Graf
008be59b08 CVolume: replace repaintVolScale() with paint() 
paint() contains repaintVolScale()
 2017-01-31 16:36:43 +01:00
Stefan Seyfried
13ab1ebc8a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)
 2016-10-22 11:37:40 +02:00
Jacek Jendrzej
a471b2af10 some compil warning fixes 2016-04-23 21:19:04 +02:00
Stefan Seyfried
eeee5bacab Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...
 2015-12-13 17:41:55 +01:00
Stefan Seyfried
5ab6b53054 global.h: Use forward-declarations to reduce number of dependencies 2015-04-16 13:39:35 +02:00
Stefan Seyfried
69c4dbbdba Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp
 2014-12-25 18:03:08 +01:00
[CST] Focus
420af7a4dc neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 2014-09-05 17:49:11 +04:00
Stefan Seyfried
ecd62d81d1 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes
 2014-02-15 20:22:07 +01:00
M. Liebmann
92fce346c0 yWeb: Synchronize volume/audiomute settings yWeb => GUI 2014-02-12 06:02:27 +01:00
svenhoefer
014dd3ac7b Revert "- add missing include of vfd header" 
This reverts commit 3845feb0e4.
 2013-11-13 23:39:55 +01:00
svenhoefer
3845feb0e4 - add missing include of vfd header 2013-11-13 10:40:18 +01:00
Stefan Seyfried
b93a372b54 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.
 2013-11-10 16:55:53 +01:00
Michael Liebmann
bace5ce91b Audioplayer: Remove special handling for display mute icon 2013-11-04 17:00:34 +01:00
Thilo Graf
6dd1da0628 revert 6ee7fac1a5 
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget
 2013-10-26 23:25:59 +02:00
Thilo Graf
6ee7fac1a5 CComponents: rename hide() to hideCC() 
There are too many name conflicts with hide-members in other classes.
 2013-10-24 21:39:04 +02:00
Stefan Seyfried
7cfe54dc2f Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
 2013-07-06 19:01:15 +02:00
Michael Liebmann
31e2dae622 Fix paint VolumeBar on InfoViewer 2013-07-03 07:30:09 +02:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
 2013-06-16 21:22:14 +02:00
Michael Liebmann
d08d18522e * Add volume bar to osd timeouts in the OSD setup 2013-06-04 01:17:39 +02:00
Stefan Seyfried
a7f1e0e25e Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
 2013-05-24 20:24:39 +02:00
Michael Liebmann
bf1c7bfdb7 * Various changes for reworked mute icon handling in some classes 
- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer
 2013-05-16 11:01:41 +01:00
Stefan Seyfried
6b72095f5a neutrino: explicitly include vfd/lcd header 
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).
 2013-05-11 17:17:33 +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
Thilo Graf
8baec6d62a CVolumeBar: rework volumebar handling 
Use CComponenets and separates the gui part from driver part

- add new class CVolumeBar as CComponentsForm
- Various changes for reworked volume bar handling in some classes
- Move AudioMute() from CVolume to new class CAudioMute
- Use CComponentsPicture to paint muteicon
 2013-05-08 05:11:24 +01:00
Stefan Seyfried
6412b32182 CVolume: consolidate fb->blit() calls 2013-04-21 18:05:21 +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
Thilo Graf
f70a30defa Progressbars: use default frame thickness 
It's unnecessary overhead to set the value everywhere, except it's needed.
 2013-04-06 08:33:51 +02:00
Michael Liebmann
adfbfe079c * Fix order of colors for some progress bars 2013-04-05 19:43:50 +01: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
Stefan Seyfried
3a32fab2f0 CVolume: remove duplicate code 2013-03-25 14:19:55 +01:00
Stefan Seyfried
78d859eb35 CVolume: add external volume control 
If CONFIGDIR/volume.sh is present it gets executed with parameter
"up" or "down" and if unless it returns nonzero, the internal volume
handling is skipped.
This allows to e.g. control the volume on the TV with samsremote.
 2013-03-24 14:51:17 +01:00
Stefan Seyfried
7f50523208 CVolume: remove duplicate code 2013-03-24 13:21:51 +01:00
Stefan Seyfried
45d8c176ec CVolume: fix border around volume bar 2013-03-11 13:32:05 +01:00
Stefan Seyfried
250fcc07fd CVolume: fix border around volume bar 2013-03-09 17:36:02 +01:00
satbaby
7ea3a20a80 src/driver/volume.cpp:-fix segfault on new fb_pixel_t with not initialized digit_h+digit_offset 2012-11-02 18:17:47 +01:00
Stefan Seyfried
30ab06762a CVolume: correctly initialize font height / width values 2012-10-31 23:21:21 +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
Thilo Graf
f3ac0b9fd9 *CVolume: move static g_volscale to volscale 
- Is only needed in this class, not global.
- move scope of variable x_corr. (style) scope of the variable x_corr
  can be limited
- move declaration of framebuffer into header file
 2012-08-21 09:48:22 +01:00
[CST] Focus
49f67b02f4 driver/volume.cpp: inherit from CChangeObserver; 
add changeNotify() for adjusting volume percent
 2012-08-16 15:54:10 +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
[CST] Focus
759203b3c4 driver/volume.cpp: fix memleak - g_volscale re-created without delete 2012-05-03 17:23:16 +04:00