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
This commit is contained in:
Michael Liebmann
2013-05-17 19:37:16 +02:00
parent c44be31bf6
commit fc2fd28825
4 changed files with 16 additions and 2 deletions

View File

@@ -372,7 +372,7 @@ void Font::RenderString(int x, int y, const int width, const char *text, const u
if (!frameBuffer->getActive())
return;
frameBuffer->checkFbArea(x, y, width, height, true);
frameBuffer->checkFbArea(x, y-height, width, height, true);
pthread_mutex_lock( &renderer->render_mutex );
@@ -622,7 +622,7 @@ void Font::RenderString(int x, int y, const int width, const char *text, const u
}
//printf("RenderStat: %d %d %d \n", renderer->cacheManager->num_nodes, renderer->cacheManager->num_bytes, renderer->cacheManager->max_bytes);
pthread_mutex_unlock( &renderer->render_mutex );
frameBuffer->checkFbArea(x, y, width, height, false);
frameBuffer->checkFbArea(x, y-height, width, height, false);
}
void Font::RenderString(int x, int y, const int width, const std::string & text, const unsigned char color, const int boxheight, const bool utf8_encoded)