Ich stelle es mal zur Diskussion.
Edit: Wo ich gerade dabei bin: ZDF(mono/Hörfilm) wird jetzt auch in beiden Tonoptionsanzeigen richtig dargestellt.
Code: Alles auswählen
diff -u -r1.196 infoviewer.cpp
--- infoviewer.cpp 1 Apr 2006 11:20:24 -0000 1.196
+++ infoviewer.cpp 15 Apr 2006 22:22:02 -0000
@@ -175,6 +175,12 @@
{
channel_id = new_channel_id;
showButtonBar = !calledFromNumZap;
+ std::string ChannelName = Channel;
+
+ if (!(g_RemoteControl->subChannels.empty()) && (g_RemoteControl->selected_subchannel >= 0)) {
+ channel_id = g_RemoteControl->subChannels[g_RemoteControl->selected_subchannel].getChannelID();
+ ChannelName = g_RemoteControl->subChannels[g_RemoteControl->selected_subchannel].subservice_name;
+ }
bool fadeIn = ((g_info.box_Type == CControld::TUXBOX_MAKER_PHILIPS) || (g_info.box_Type == CControld::TUXBOX_MAKER_SAGEM)) && // eNX only
g_settings.widget_fade &&
@@ -247,7 +253,7 @@
paintTime( false, true );
// ... with channel name
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX+ 10, ChanNameY+ time_height, BoxEndX- (ChanNameX+ 20)- time_width- 15, Channel, COL_INFOBAR, 0, true); // UTF-8
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX+ 10, ChanNameY+ time_height, BoxEndX- (ChanNameX+ 20)- time_width- 15, ChannelName, COL_INFOBAR, 0, true); // UTF-8
ChanInfoX = BoxStartX + (ChanWidth / 3);
int ChanInfoY = BoxStartY + ChanHeight+ 10;
@@ -531,7 +537,7 @@
frameBuffer->paintBackgroundBoxRel(x+ dx, y, borderwidth, dy);
frameBuffer->paintBoxRel(x, y, dx, dy, COL_MENUCONTENT_PLUS_0);
- g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(x+10, y+ 30, dx-20, text, COL_MENUCONTENT);
+ g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString(x+10, y+ 30, dx-20, text, COL_MENUCONTENT, 0, true); // UTF-8
if ( g_RemoteControl->director_mode )
{