Commit Graph

24 Commits

Author SHA1 Message Date
Stefan Seyfried
083bc55347 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
Thilo Graf
d6c76ef8a8 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8baec6d62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-04 (Sat, 04 May 2013)



------------------
This commit was generated by Migit
2013-05-08 05:11:24 +01:00
Stefan Seyfried
90a48f3c4d CVolume: consolidate fb->blit() calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6412b32182
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-21 (Sun, 21 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-21 18:05:21 +02:00
Stefan Seyfried
ab5760e4de 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 14:28:16 +02:00
Thilo Graf
307a8675b6 Progressbars: use default frame thickness
It's unnecessary overhead to set the value everywhere, except it's needed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f70a30defa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-05 (Fri, 05 Apr 2013)



------------------
This commit was generated by Migit
2013-04-06 08:33:51 +02:00
Michael Liebmann
81953e4bb6 Fix order of colors for some progress bars
Origin commit data
------------------
Branch: ni/coolstream
Commit: adfbfe079c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)

Origin message was:
------------------
* Fix order of colors for some progress bars

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-05 19:43:50 +01:00
Thilo Graf
71248e0dc7 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)



------------------
This commit was generated by Migit
2013-04-02 09:31:05 +02:00
Stefan Seyfried
c17d2a00cc CVolume: remove duplicate code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a32fab2f0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-25 14:19:55 +01:00
Stefan Seyfried
a9f7607c7f 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.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 78d859eb35
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)



------------------
This commit was generated by Migit
2013-03-24 14:51:17 +01:00
Stefan Seyfried
e432016395 CVolume: remove duplicate code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f50523208
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-24 13:21:51 +01:00
Stefan Seyfried
91c0d8eaeb CVolume: fix border around volume bar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 45d8c176ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-11 13:32:05 +01:00
Stefan Seyfried
79c700fe35 CVolume: fix border around volume bar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 250fcc07fd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-09 17:36:02 +01:00
Jacek Jendrzej
9d1444a8df src/driver/volume.cpp:-fix segfault on new fb_pixel_t with not initialized digit_h+digit_offset
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ea3a20a80
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-02 18:17:47 +01:00
Stefan Seyfried
dd311cfe15 CVolume: correctly initialize font height / width values
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30ab06762a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-10-31 23:21:21 +01:00
Stefan Seyfried
a603ec74af Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'
...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


Origin commit data
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)



------------------
This commit was generated by Migit
2012-10-14 12:51:07 +02:00
Thilo Graf
d0f8a1c3b4 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: f3ac0b9fd9
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-29 (Sun, 29 Jul 2012)

Origin message was:
------------------
*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


------------------
This commit was generated by Migit
2012-08-21 09:48:22 +01:00
[CST] Focus
777ebc475f driver/volume.cpp: inherit from CChangeObserver;
add changeNotify() for adjusting volume percent


Origin commit data
------------------
Branch: ni/coolstream
Commit: 49f67b02f4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)



------------------
This commit was generated by Migit
2012-08-16 15:54:10 +04:00
Michael Liebmann
f52af18765 Numeric display volumebar can be switched off.
- Adjustable via Menu -> Settings -> OSD -> Volumebar digits


Origin commit data
------------------
Branch: ni/coolstream
Commit: ccd8e39182
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-27 (Fri, 27 Apr 2012)

Origin message was:
------------------
* Numeric display volumebar can be switched off.

- Adjustable via Menu -> Settings -> OSD -> Volumebar digits


------------------
This commit was generated by Migit
2012-07-23 09:07:10 +01:00
[CST] Focus
79ae3316d0 driver/volume.cpp: fix memleak - g_volscale re-created without delete
Origin commit data
------------------
Branch: ni/coolstream
Commit: 759203b3c4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-05-03 17:23:16 +04:00
Stefan Seyfried
7170a10c92 CVolume: avoid possible memleaks, add fb->blit() calls
also, check for global objects which might get created later


Origin commit data
------------------
Branch: ni/coolstream
Commit: b29c608594
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-15 (Sun, 15 Apr 2012)



------------------
This commit was generated by Migit
2012-04-17 20:29:30 +02:00
Stefan Seyfried
0a891bba0b CVolume: fix multiplatform build issue
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7dbdabb11
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-14 (Sat, 14 Apr 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-04-17 19:34:00 +02:00
[CST] Focus
c569070244 driver/volume.cpp: comment second creation of g_Zapit, g_RCInput; Use global g_RemoteControl
Origin commit data
------------------
Branch: ni/coolstream
Commit: 016ab6c088
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-17 (Tue, 17 Apr 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-04-17 14:51:51 +04:00
Michael Liebmann
d883c7bba7 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 01a520ab17
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-03-24 (Sat, 24 Mar 2012)

Origin message was:
------------------
* 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


------------------
This commit was generated by Migit
2012-03-24 08:31:17 +00:00
Michael Liebmann
85222c3559 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a5ffc315f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-03-18 (Sun, 18 Mar 2012)

Origin message was:
------------------
* 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


------------------
This commit was generated by Migit
2012-03-18 18:46:48 +00:00