From e331f2bf384011519031fe1322a1cf19a0f7269c Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 19 Aug 2020 14:31:35 -0400 Subject: [PATCH] 2020-08-19 Fred Gleason * Fixed compiler warnings in 'lib/rdsettings.cpp' and 'lib/rdstation.cpp'. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ lib/rdsettings.cpp | 7 +++++-- lib/rdstation.cpp | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49c81788..42946819 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20265,3 +20265,6 @@ * Changed the contents of the 'FEEDS.PURGE_PASSWORD' database field from plaintext to Base64 encoding. * Incremented the database version to 334. +2020-08-19 Fred Gleason + * Fixed compiler warnings in 'lib/rdsettings.cpp' and + 'lib/rdstation.cpp'. diff --git a/lib/rdsettings.cpp b/lib/rdsettings.cpp index acef4db2..f871b8f5 100644 --- a/lib/rdsettings.cpp +++ b/lib/rdsettings.cpp @@ -138,8 +138,6 @@ void RDSettings::setAutotrimLevel(int level) QString RDSettings::description() { - QString sql; - RDSqlQuery *q; QString desc; QString sr=QString().sprintf("%d S/sec",set_sample_rate); switch(set_format) { @@ -147,6 +145,10 @@ QString RDSettings::description() desc="PCM16, "; break; + case RDSettings::Pcm24: + desc="PCM24, "; + break; + case RDSettings::MpegL1: desc="MPEG L1, "; if(set_bit_rate==0) { @@ -158,6 +160,7 @@ QString RDSettings::description() break; case RDSettings::MpegL2: + case RDSettings::MpegL2Wav: desc="MPEG L2, "; if(set_bit_rate==0) { desc+=QString().sprintf("Qual %d, ",set_quality); diff --git a/lib/rdstation.cpp b/lib/rdstation.cpp index 541979aa..4c1666ee 100644 --- a/lib/rdstation.cpp +++ b/lib/rdstation.cpp @@ -1901,7 +1901,6 @@ void RDStation::remove(const QString &name) { QString sql; RDSqlQuery *q; - RDSqlQuery *q1; sql=QString("delete from DECKS where ")+ "STATION_NAME=\""+RDEscapeString(name)+"\"";