mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-07 21:58:35 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,182 Commits 1 Branch 51 Tags
d5d5a60261b1de03f1f6eb46a7e2c4f03ba14ed5
Commit Graph

29 Commits

Author SHA1 Message Date
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
Stefan Seyfried
b29c608594 CVolume: avoid possible memleaks, add fb->blit() calls 
also, check for global objects which might get created later
 2012-04-17 20:29:30 +02:00
Stefan Seyfried
d7dbdabb11 CVolume: fix multiplatform build issue 2012-04-17 19:34:00 +02:00
[CST] Focus
016ab6c088 driver/volume.cpp: comment second creation of g_Zapit, g_RCInput; Use global g_RemoteControl 2012-04-17 14:51:51 +04:00
micha-bbg
01a520ab17 * Problems with display volume control (patch by snafed) 
- Fixes display problems when setting 'mute icon volume at 0'
- Fixes problems with neutrino getMode() switching

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2160 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-24 08:31:17 +00:00
micha-bbg
6a5ffc315f * neutrino: GUI Painting of Vol. Mute and Clock (Part3) 
- Use new class for volumebar
- Numeric display added for volumebar (switchable)
- Display of volumebar, mute icon and info clock optimized (top right)
- Volumebar better scalable

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2153 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-18 18:46:48 +00:00