From a82138d402cf2c147e664b3990feddcb68c92dc2 Mon Sep 17 00:00:00 2001
From: Ulrich Eckhardt <uli@uli-eckhardt.de>
Date: Sun, 18 Feb 2018 14:51:32 +0100
Subject: =?UTF-8?q?Bugfixes=20from=20J=C3=B6rg=20Wendel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This bugfix contains also a change to the radio text service
---
 Makefile     |  2 ++
 radio.c      | 11 ++++++-----
 radioaudio.c |  7 ++++---
 radiotools.c |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 665bd68..3fe2a3a 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,8 @@ TMPDIR ?= /tmp
 export CFLAGS   = $(call PKGCFG,cflags)
 export CXXFLAGS = $(call PKGCFG,cxxflags)
 
+CXXFLAGS += -Wno-unused-result
+
 ### The version number of VDR's plugin API:
 
 APIVERSION = $(call PKGCFG,apiversion)
diff --git a/radio.c b/radio.c
index a7f1415..f5ed041 100644
--- a/radio.c
+++ b/radio.c
@@ -77,7 +77,7 @@ struct RadioTextService_v1_0 {
     char *rds_text;
     char *rds_title;
     char *rds_artist;
-    struct tm *title_start;
+    time_t title_start;
 };
 
 
@@ -130,7 +130,7 @@ void cRadioCheck::Stop(void) {
 void cRadioCheck::Action(void)
 {
 
-    if ((S_Verbose && 0x0f) >= 2)
+    if ((S_Verbose & 0x0f) >= 2)
         printf("vdr-radio: background-checking starts\n");
 
     while (Running()) {
@@ -201,7 +201,7 @@ void cRadioCheck::Action(void)
             cRemote::CallPlugin("radio");
         }
 
-    if ((S_Verbose && 0x0f) >= 2)
+    if ((S_Verbose & 0x0f) >= 2)
         printf("vdr-radio: background-checking ends\n");
 }
 
@@ -605,8 +605,9 @@ bool cPluginRadio::Service(const char *Id, void *Data)
             data->rds_text = RT_Text[ind];
             data->rds_title = RTP_Title;
             data->rds_artist = RTP_Artist;
-            struct tm tm_store;
-            data->title_start = localtime_r(&RTP_Starttime, &tm_store);
+            // struct tm tm_store;
+            // data->title_start = localtime_r(&RTP_Starttime, &tm_store);
+            data->title_start = RTP_Starttime;
             }
         return true;
         }
diff --git a/radioaudio.c b/radioaudio.c
index 19e63a2..b5e934c 100644
--- a/radioaudio.c
+++ b/radioaudio.c
@@ -167,7 +167,7 @@ void cRadioImage::Stop(void) {
 
 void cRadioImage::Action(void)
 {
-    if ((S_Verbose && 0x0f) >= 2)
+    if ((S_Verbose & 0x0f) >= 2)
         printf("vdr-radio: image-showing starts\n");
 
     while (Running()) {
@@ -178,7 +178,7 @@ void cRadioImage::Action(void)
             }
         }
 
-    if ((S_Verbose && 0x0f) >= 2)
+    if ((S_Verbose & 0x0f) >= 2)
         printf("vdr-radio: image-showing ends\n");
 }
 
@@ -395,10 +395,11 @@ void cRDSReceiver::Receive(uchar *Data, int Length)
                                         case 0xcd46:    if ((S_Verbose & 0x20) > 0) {
                                                             unsigned char tmc[6];       // TMC Alert-C
                                                             int i;
-                                                            for (i=9; i<=(index-3); i++) 
+                                                            for (i=9; i<=(index-3); i++) {
                                                                 tmc[i-9] = mtext[i];
                                                                 tmc_parser(tmc, i-8);
                                                             }
+                                                        }
                                                         break;
                                         default:        if ((S_Verbose & 0x0f) >= 2)
                                                             printf("[RDS-ODA AID '%02x%02x' not used -> End]\n", mtext[7], mtext[8]);
diff --git a/radiotools.c b/radiotools.c
index 8ca9c19..c30239d 100644
--- a/radiotools.c
+++ b/radiotools.c
@@ -65,7 +65,7 @@ unsigned short crc16_ccitt(unsigned char *daten, int len, bool skipfirst)
     // with start 0xffff and result invers
     register unsigned short crc = 0xffff;
 
-    if (skipfirst) *daten++;
+    if (skipfirst) daten++;
     while (len--) {
     crc = (crc >> 8) | (crc << 8);
     crc ^= *daten++;
-- 
cgit v1.2.3