Commit Graph

1533 Commits

Author SHA1 Message Date
[CST] Focus
ef76e79172 neutrino.cpp: start epg scan on enter standby, wakeup epg scan on record stop
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c7b80010e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-10 19:01:46 +04:00
Jacek Jendrzej
af33300905 CNeutrinoApp::handleMsg: -fix segfault if Bouquets is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35b49b302d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-08 07:18:32 +02:00
vanhofen
cffdcf2577 change plugin_hdd_dir to a more suitable setting
auto-create plugin_hdd_dir


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ccb3ef387
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-07 (Mon, 07 Oct 2013)

Origin message was:
------------------
- change plugin_hdd_dir to a more suitable setting

 auto-create plugin_hdd_dir


------------------
This commit was generated by Migit
2013-10-07 17:22:52 +02:00
vanhofen
81e7e9c8c0 change logo_hdd_dir to a more suitable setting
auto-create logo_hdd_dir


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f1f1b6b86
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-07 (Mon, 07 Oct 2013)

Origin message was:
------------------
- change logo_hdd_dir to a more suitable setting

 auto-create logo_hdd_dir


------------------
This commit was generated by Migit
2013-10-07 17:21:25 +02:00
Thilo Graf
4e710cf30e CNeutrinoApp: fix color of active channel in bouqets
supplement to 468cdc0835
see also:
http://www.dbox2world.net/board293-cst-coolstream/board314-cst-coolstream-development/p157782-next-cc-branch/#post157782


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ac3656272
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)



------------------
This commit was generated by Migit
2013-10-06 17:07:17 +02:00
[CST] Focus
899ade2676 neutrino.cpp: fix epg_scan option saving
Origin commit data
------------------
Branch: ni/coolstream
Commit: aff6f77cef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-02 18:35:11 +04:00
Michael Liebmann
41b27e957f Image backup apollo Part #6
- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity


Origin commit data
------------------
Branch: ni/coolstream
Commit: d00cb6f8ec
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)

Origin message was:
------------------
Image backup apollo Part #6

- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity


------------------
This commit was generated by Migit
2013-09-27 06:44:43 +02:00
[CST] Focus
66c5c51b0e channel list: restrict adding channels to favorits only,
show empty bouquets only in channel add mode


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a8f996ca0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-18 (Wed, 18 Sep 2013)



------------------
This commit was generated by Migit
2013-09-18 12:57:56 +04:00
[CST] Focus
6058ed50fb neutrino.cpp: fix malloc_stats call for uclibc
Origin commit data
------------------
Branch: ni/coolstream
Commit: d3ff93e12e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-09 (Mon, 09 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-09 12:42:01 +04:00
Jacek Jendrzej
93afa5a39a neutrino: disable commit 636c6cad35 for test
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7224f4c99
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-09 (Mon, 09 Sep 2013)

Origin message was:
------------------
neutrino: disable commit 636c6cad35 for test

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

------------------
This commit was generated by Migit
2013-09-09 08:03:29 +02:00
Jacek Jendrzej
42ceb5b236 CNeutrinoApp::handleMsg:zap to rec channel in standby-mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab1757a963
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-07 (Sat, 07 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-07 21:16:47 +02:00
Jacek Jendrzej
75b1b8625b supplement to 636c6cad35 fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: be28b961c7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-07 (Sat, 07 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-07 17:11:47 +02:00
Jacek Jendrzej
ab6b8908d4 supplement to 636c6cad35
Origin commit data
------------------
Branch: ni/coolstream
Commit: 352ab3e7c0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-07 (Sat, 07 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-07 16:39:30 +02:00
Jacek Jendrzej
636c6cad35 CNeutrinoApp::handleMsg:zap to rec channel if box start from deepstandby
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4111ff45cb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-07 (Sat, 07 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-07 16:17:27 +02:00
Stefan Seyfried
af252a3d89 Merge branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 50977ef2f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-03 (Tue, 03 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-03 09:36:49 +02:00
vanhofen
930f73dae6 osd_setup: introduce g_settings.window_size to scale some windows
* remove g_settings.big_windows
* add setup window (use up/down to change size)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ed30528f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- osd_setup: introduce g_settings.window_size to scale some windows

* remove g_settings.big_windows
* add setup window (use up/down to change size)


------------------
This commit was generated by Migit
2013-09-02 20:59:26 +02:00
Stefan Seyfried
dad3855a49 neutrino: fix up non-extupdate build
this complements commit 070ca8469d after recent changes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58f6480a34
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 20:11:30 +02:00
Stefan Seyfried
2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.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/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
Jacek Jendrzej
65592c10c4 gui/scan_setup:fix override gotoXXLongitude & gotoXXLatitude with uninitialized zapit_lat or zapit_long
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e60b64469
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-01 (Sun, 01 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-01 14:35:35 +02:00
Michael Liebmann
903f661ee8 Softupdate: Use user-defined file names
for apply settings and saving partitions from the flash.


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc069b0a84
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)



------------------
This commit was generated by Migit
2013-08-20 02:55:54 +02:00
[CST] Focus
46b3baebcd neutrino.cpp: change apply_settings default to false
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9436634220
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)


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

------------------
This commit was generated by Migit
2013-08-13 20:13:09 +04:00
[CST] Focus
2175d4baa0 neutrino: add EVT_BACK_ZAP_COMPLETE event for background epg scan zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: f210a8c048
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-12 (Mon, 12 Aug 2013)


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

------------------
This commit was generated by Migit
2013-08-13 20:10:02 +04:00
Stefan Seyfried
9362ed2b29 fix screen mode selection logic error on TD
wrong screen mode default "LCD" was introduced with commit 78bb53b64,
leading to HD framebuffer settings which don't make sense :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e5a63f70c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-08-03 (Sat, 03 Aug 2013)



------------------
This commit was generated by Migit
2013-08-03 18:48:33 +02:00
Michael Liebmann
4f0d411e1c CNeutrinoFonts: Use separate font renderer for dynamic fonts
- delete / initialize font renderer only if necessary
 (e.g. start program, change the font file, change the scaling)


Origin commit data
------------------
Branch: ni/coolstream
Commit: e473df6a43
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)

Origin message was:
------------------
CNeutrinoFonts: Use separate font renderer for dynamic fonts

- delete / initialize font renderer only if necessary
 (e.g. start program, change the font file, change the scaling)


------------------
This commit was generated by Migit
2013-07-26 14:52:37 +02:00
Michael Liebmann
497312d01b CNeutrinoFonts: Fix segfault, when fontfile changed
- use std::string for font and style names


Origin commit data
------------------
Branch: ni/coolstream
Commit: aca97e210e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)



------------------
This commit was generated by Migit
2013-07-21 22:06:40 +02:00
Michael Liebmann
a552ac1c82 Add option to resize the VolumeBar
- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
 Menu -> Settings -> OSD -> Volume -> Height of display


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a0035c2ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-29 (Sat, 29 Jun 2013)

Origin message was:
------------------
Add option to resize the VolumeBar

- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
 Menu -> Settings -> OSD -> Volume -> Height of display


------------------
This commit was generated by Migit
2013-07-21 22:06:05 +02:00
Michael Liebmann
365badceee Add dynamic fonts to CNeutrinoFonts
- Dynamic fonts with their size matched to a given text box.
 The display size is retained even when changing the font size factor.
- "Normal" dynamic fonts, characterized by FONT_ID_SHARE in
 CNeutrinoFonts::getDynFont() can be used by several objects
 simultaneously. That is, if the calculated font size and font style
 are the same, the existing font is used.
- Dynamic font for exclusive application will only be used by an object.
 For this, a FontID (FONT_ID_xxx, defined in src/driver/neutrinofonts.h)
 in CNeutrinoFonts::getDynFont() is specified.
- Objects with dynamic font for exclusive application can resize at
 run time, the font size will be adjusted accordingly.
- The return value of CNeutrinoFonts::getDynFont() is a pointer
 to a font, for example:
 Font** font = CNeutrinoFonts::getInstance()->getDynFont(...);
 (*font)->RenderString(...)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bcb7bcfae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-28 (Fri, 28 Jun 2013)

Origin message was:
------------------
Add dynamic fonts to CNeutrinoFonts

- Dynamic fonts with their size matched to a given text box.
 The display size is retained even when changing the font size factor.
- "Normal" dynamic fonts, characterized by FONT_ID_SHARE in
 CNeutrinoFonts::getDynFont() can be used by several objects
 simultaneously. That is, if the calculated font size and font style
 are the same, the existing font is used.
- Dynamic font for exclusive application will only be used by an object.
 For this, a FontID (FONT_ID_xxx, defined in src/driver/neutrinofonts.h)
 in CNeutrinoFonts::getDynFont() is specified.
- Objects with dynamic font for exclusive application can resize at
 run time, the font size will be adjusted accordingly.
- The return value of CNeutrinoFonts::getDynFont() is a pointer
 to a font, for example:
 Font** font = CNeutrinoFonts::getInstance()->getDynFont(...);
 (*font)->RenderString(...)


------------------
This commit was generated by Migit
2013-07-21 22:05:18 +02:00
Michael Liebmann
c82257306f Add new class CNeutrinoFonts for setup and modify neutrino fonts
- move SetupFonts() from CNeutrinoApp to CFontSetup


Origin commit data
------------------
Branch: ni/coolstream
Commit: 465d2aba23
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-27 (Thu, 27 Jun 2013)



------------------
This commit was generated by Migit
2013-07-21 22:05:14 +02:00
[CST] Focus
c5f9a0e691 neutrino.cpp: add buttons backlight settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: c31c9d0e7f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-18 14:52:00 +04:00
tomworld
1bca8a26ce keybind_setup: add possibility to disable/enable some special keys
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea66aaaf8f
Author: tomworld <atzeworld@msn.com>
Date: 2013-07-12 (Fri, 12 Jul 2013)

Origin message was:
------------------
- keybind_setup: add possibility to disable/enable some special keys

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

------------------
This commit was generated by Migit
2013-07-12 15:50:30 +02:00
Stefan Seyfried
7e692549d3 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit
2013-07-06 19:01:15 +02:00
Michael Liebmann
ca470f6323 CVolumeBar: add enums for volume bar pos
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a63a85584
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-26 (Wed, 26 Jun 2013)


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

------------------
This commit was generated by Migit
2013-07-03 07:30:09 +02:00
[CST] Focus
0a5f0d0f27 neutrino.cpp: fix analog_mode1 on apollo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06a3533d68
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-27 (Thu, 27 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-27 15:03:49 +04:00
Stefan Seyfried
4c3c21152b 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
2013-06-16 21:22:14 +02:00
Michael Liebmann
7c918cd407 Software update: Disable epg scan before stop daemons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32617f5b3c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-15 (Sat, 15 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-15 04:46:59 +02:00
Michael Liebmann
07268967ab Software update: Copy flashimage to /tmp if it is not present in this directory
- unmount mounted network folders before flashing
- kill timerd before flashing


Origin commit data
------------------
Branch: ni/coolstream
Commit: c780676ce5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)



------------------
This commit was generated by Migit
2013-06-13 01:36:03 +02:00
[CST] Focus
1bf53c5734 neutrino.cpp: save/load epg_scan option;
process EVT_EIT_COMPLETE


Origin commit data
------------------
Branch: ni/coolstream
Commit: db40f59c84
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)



------------------
This commit was generated by Migit
2013-06-12 18:46:34 +04:00
Michael Liebmann
d105113462 neutrino.cpp/stop_daemons(): display "Stop daemons" only in flash mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 64974f0692
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* neutrino.cpp/stop_daemons(): display "Stop daemons" only in flash mode

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

------------------
This commit was generated by Migit
2013-06-08 17:19:40 +02:00
Michael Liebmann
281a5d8f81 Software update: Rework preparing the flash process
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes


Origin commit data
------------------
Branch: ni/coolstream
Commit: c26fd64759
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Rework preparing the flash process

- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes


------------------
This commit was generated by Migit
2013-06-08 16:20:32 +02:00
Michael Liebmann
301a522b57 Software update: Apply the settings in the options menu switchable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 365661e841
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Apply the settings in the options menu switchable

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

------------------
This commit was generated by Migit
2013-06-08 16:20:32 +02:00
Michael Liebmann
80ddb22bed Add volume bar to osd timeouts in the OSD setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: d08d18522e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-03 (Mon, 03 Jun 2013)

Origin message was:
------------------
* Add volume bar to osd timeouts in the OSD setup

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

------------------
This commit was generated by Migit
2013-06-04 01:17:39 +02:00
[CST] Focus
93eb0c1679 Merge branch 'next' into next-cc
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)



------------------
This commit was generated by Migit
2013-06-02 10:46:42 +04:00
Stefan Seyfried
c3ea7f0bbf neutrino: don't spam with --enable-cleanup
sectionsd already does malloc_stats()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6aee976490
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)



------------------
This commit was generated by Migit
2013-06-01 15:50:35 +02:00
Stefan Seyfried
78bb53b641 neutrino: generic-pc is now also using 1280x70 FB per default
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb9eba8914
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)


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

------------------
This commit was generated by Migit
2013-05-29 15:30:06 +02:00
Stefan Seyfried
5cd9f154ff neutrino/femanager: fix format string warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bb8fd218a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)


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

------------------
This commit was generated by Migit
2013-05-28 16:24:35 +02:00
Jacek Jendrzej
75f50de7eb fix comma at end of enumerator list
Origin commit data
------------------
Branch: ni/coolstream
Commit: a549b97924
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-28 (Tue, 28 May 2013)


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

------------------
This commit was generated by Migit
2013-05-28 15:52:31 +02:00
Jacek Jendrzej
c9565c9d33 ChannelList::quickZap -record mode- should zap if possible, else display transponderlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: a01551d360
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-25 (Sat, 25 May 2013)

Origin message was:
------------------
ChannelList::quickZap -record mode- should zap if possible, else display transponderlist

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

------------------
This commit was generated by Migit
2013-05-25 13:05:55 +02:00
Stefan Seyfried
07ccb9a351 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


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



------------------
This commit was generated by Migit
2013-05-24 20:24:39 +02:00
Michael Liebmann
fc2fd28825 Mute icon: Fix minor bugs
- Fix display the mute icon when leaving the audio player
- Disable mute icon in channellist when 'Quickzap in list' active or allow
- Fix hide the mute icon in movie browser, picture viewer,
 file browser and upnp browser
- Font::RenderString(): Use correct value of y for CFrameBuffer::checkFbArea()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5eb7f4aea8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-17 (Fri, 17 May 2013)

Origin message was:
------------------
* Mute icon: Fix minor bugs

- Fix display the mute icon when leaving the audio player
- Disable mute icon in channellist when 'Quickzap in list' active or allow
- Fix hide the mute icon in movie browser, picture viewer,
 file browser and upnp browser
- Font::RenderString(): Use correct value of y for CFrameBuffer::checkFbArea()


------------------
This commit was generated by Migit
2013-05-18 14:44:20 +01:00
Michael Liebmann
5235cec6d0 Various changes for reworked mute icon handling in some classes
- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf1c7bfdb7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Origin message was:
------------------
* Various changes for reworked mute icon handling in some classes

- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer


------------------
This commit was generated by Migit
2013-05-16 11:01:41 +01:00