epgsearch: more space for channel names

Message ID 4DD645BC32%linux@youmustbejoking.demon.co.uk
State New
Headers

Commit Message

Darren Salt Dec. 8, 2005, 11:36 p.m. UTC
  The attached patch uses 12 characters for the displayed channel names rather
than 10. Without this, various BBC radio channels are distinguishable only by
number.
  

Patch

diff -urNad vdr-plugin-epgsearch-0.9.8c~/menu_main.c vdr-plugin-epgsearch-0.9.8c/menu_main.c
--- vdr-plugin-epgsearch-0.9.8c~/menu_main.c	2005-11-19 07:28:07.000000000 +0000
+++ vdr-plugin-epgsearch-0.9.8c/menu_main.c	2005-12-05 16:07:58.475073208 +0000
@@ -37,7 +37,7 @@ 
 
 
 cMenuSearchMain::cMenuSearchMain(void)
-:cOsdMenu("", 10, 7, 4)
+:cOsdMenu("", 12, 7, 4)
 {
     otherChannel = 0;
     toggleKeys = 0;
diff -urNad vdr-plugin-epgsearch-0.9.8c~/menu_searchresults.c vdr-plugin-epgsearch-0.9.8c/menu_searchresults.c
--- vdr-plugin-epgsearch-0.9.8c~/menu_searchresults.c	2005-11-30 19:19:51.000000000 +0000
+++ vdr-plugin-epgsearch-0.9.8c/menu_searchresults.c	2005-12-05 16:08:54.683154868 +0000
@@ -42,12 +42,12 @@ 
     if(eventInfo->ShortText())
     {
 	if (!bEpisodeOnly)
-	    asprintf(&buffer, "%.*s\t%.*s\t%.*s\t%c%c%c\t%s%s%s", 10, CHANNELNAME(channel), 6, GETDATESTRING(eventInfo), 5, GETTIMESTRING(eventInfo), t, v, r, bEpisodeOnly?NULL:eventInfo->Title(), !isempty(eventInfo->ShortText())?" ~ ":"", !isempty(eventInfo->ShortText())?eventInfo->ShortText():"");
+	    asprintf(&buffer, "%.*s\t%.*s\t%.*s\t%c%c%c\t%s%s%s", 12, CHANNELNAME(channel), 6, GETDATESTRING(eventInfo), 5, GETTIMESTRING(eventInfo), t, v, r, bEpisodeOnly?NULL:eventInfo->Title(), !isempty(eventInfo->ShortText())?" ~ ":"", !isempty(eventInfo->ShortText())?eventInfo->ShortText():"");
 	else
-	    asprintf(&buffer, "%.*s\t%.*s\t%.*s\t%c%c%c\t%s", 10, CHANNELNAME(channel), 6, GETDATESTRING(eventInfo), 5, GETTIMESTRING(eventInfo), t, v, r, eventInfo->ShortText());
+	    asprintf(&buffer, "%.*s\t%.*s\t%.*s\t%c%c%c\t%s", 12, CHANNELNAME(channel), 6, GETDATESTRING(eventInfo), 5, GETTIMESTRING(eventInfo), t, v, r, eventInfo->ShortText());
     }
     else
-	asprintf(&buffer, "%.*s\t%.*s\t%.*s\t%c%c%c\t%s", 10, CHANNELNAME(channel), 6, GETDATESTRING(eventInfo), 5, GETTIMESTRING(eventInfo), t, v, r, eventInfo->Title());
+	asprintf(&buffer, "%.*s\t%.*s\t%.*s\t%c%c%c\t%s", 12, CHANNELNAME(channel), 6, GETDATESTRING(eventInfo), 5, GETTIMESTRING(eventInfo), t, v, r, eventInfo->Title());
 
     if (EPGSearchConfig.showChannelNr)
     {
diff -urNad vdr-plugin-epgsearch-0.9.8c~/menu_whatson.c vdr-plugin-epgsearch-0.9.8c/menu_whatson.c
--- vdr-plugin-epgsearch-0.9.8c~/menu_whatson.c	2005-11-20 18:53:59.000000000 +0000
+++ vdr-plugin-epgsearch-0.9.8c/menu_whatson.c	2005-12-05 16:08:32.552697612 +0000
@@ -34,7 +34,7 @@ 
       if (iProgress > 0)
       {     
 	  if (EPGSearchConfig.showChannelNr)
-	      asprintf(&buffer, "%d\t%.*s\t%s\t\t\t%s%s%s", channel->Number(), 10, 
+	      asprintf(&buffer, "%d\t%.*s\t%s\t\t\t%s%s%s", channel->Number(), 12,
 		       CHANNELNAME(channel), "", 
 		       tr(">>> no info! <<<"), "", "");
 	  else
@@ -45,7 +45,7 @@ 
       else
       {
 	  if (EPGSearchConfig.showChannelNr)
-	      asprintf(&buffer, "%d\t%.*s\t%s\t\t%s%s%s", channel->Number(), 10, 
+	      asprintf(&buffer, "%d\t%.*s\t%s\t\t%s%s%s", channel->Number(), 12,
 		       CHANNELNAME(channel), "", 
 		       tr(">>> no info! <<<"), "", "");
 	  else