From patchwork Thu Dec 8 23:36:01 2005 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Salt X-Patchwork-Id: 12114 Received: from anchor-post-36.mail.demon.net ([194.217.242.86]) by www.linuxtv.org with esmtp (Exim 4.50) id 1EkVVK-0003Um-6r for vdr@linuxtv.org; Fri, 09 Dec 2005 00:48:50 +0100 Received: from youmustbejoking.demon.co.uk ([212.228.127.8] helo=pentagram.youmustbejoking.demon.co.uk) by anchor-post-36.mail.demon.net with esmtp (Exim 4.42) id 1EkVVG-0007iM-Lj for vdr@linuxtv.org; Thu, 08 Dec 2005 23:48:49 +0000 Received: from [192.168.0.2] (helo=riscpc) by pentagram.youmustbejoking.demon.co.uk with esmtp (Exim 4.50) id 1EkVVF-0005Ft-70 for vdr@linuxtv.org; Thu, 08 Dec 2005 23:48:45 +0000 Date: Thu, 08 Dec 2005 23:36:01 +0000 From: Darren Salt To: vdr@linuxtv.org Message-ID: <4DD645BC32%linux@youmustbejoking.demon.co.uk> User-Agent: Messenger-Pro/3.30b11 (MsgServe/3.11b2) (RISC-OS/4.02) POPstar/2.06+cvs X-Editor: Zap 1.47 (17 Oct 2005) [TEST], ZapEmail 0.28.3 (25 Mar 2005) (32) X-SDate: Thu, 4482 Sep 1993 23:36:01 +0000 X-Message-Flag: Outlook Express is broken. Upgrade to mail(1). MIME-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.0.2 X-SA-Exim-Mail-From: linux@youmustbejoking.demon.co.uk X-SA-Exim-Scanned: No (on pentagram.youmustbejoking.demon.co.uk); SAEximRunCond expanded to false Subject: [vdr] [PATCH] epgsearch: more space for channel names X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Dec 2005 23:48:50 -0000 Status: O X-Status: X-Keywords: X-UID: 6545 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. 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