Patch by Andreas Brachold (indentation fixed by wolfgang61):

make gcc4.3 happy by adding more parentheses and brackets


git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@1215 e10066b5-e1e2-0310-b819-94efdf66514b

6 files changed, 20 insertions, 17 deletions

diff --git a/lyrics.c b/lyrics.c
index 76c1278..00dc0fe 100644
--- a/lyrics.c
+++ b/lyrics.c
@@ -75,7 +75,7 @@ mgLyrics::Process(eKeys key) {
 		state=lyricsSaved;
 	}
 	long cl=playItem->getCheckedForTmpLyrics();
-	if (displayItem!=playItem || cl>0 && cl<time(0)) {
+	if (displayItem!=playItem || (cl>0 && cl<time(0))) {
 		if (!access(playItem->getCachedFilename("lyrics.tmp.loading").c_str(),R_OK)) {
 			state=lyricsLoading;
 			playItem->setCheckedForTmpLyrics(time(0));
diff --git a/mg_db.c b/mg_db.c
index 5f05518..7c6a87d 100644
--- a/mg_db.c
+++ b/mg_db.c
@@ -1506,14 +1506,15 @@ mgKeyGdGenres::GenreClauses(mgDb *db,bool groupby) const
 	strlist g1;
 	strlist g2;
 
-	if (groupby)
-	if (genrelevel()==4) {
-		g1.push_back("tracks.genre1=genre.id");
-		g2.push_back("tracks.genre2=genre.id");
-	}
-	else {
-		g1.push_back("substr(tracks.genre1,1,"+ltos(genrelevel())+")=genre.id");
-		g2.push_back("substr(tracks.genre2,1,"+ltos(genrelevel())+")=genre.id");
+	if (groupby) {
+	  if (genrelevel()==4) {
+			g1.push_back("tracks.genre1=genre.id");
+			g2.push_back("tracks.genre2=genre.id");
+		}
+		else {
+			g1.push_back("substr(tracks.genre1,1,"+ltos(genrelevel())+")=genre.id");
+			g2.push_back("substr(tracks.genre2,1,"+ltos(genrelevel())+")=genre.id");
+		}
 	}
 
 	if (valid()) {
diff --git a/mg_selection.c b/mg_selection.c
index ffaee1c..80738a4 100644
--- a/mg_selection.c
+++ b/mg_selection.c
@@ -497,11 +497,12 @@ mgSelection::gotoPosition () {
 unsigned int
 mgSelection::getItemPosition() const
 {
-	if (m_items_position>=m_items.size())
+	if (m_items_position>=m_items.size()) {
 		if (m_items.size()==0)
 			m_items_position=0;
-	else
-		m_items_position = m_items.size()-1;
+		else
+			m_items_position = m_items.size()-1;
+	}
 	return m_items_position;
 }
 
diff --git a/vdr_actions.c b/vdr_actions.c
index fffa668..6e775b6 100644
--- a/vdr_actions.c
+++ b/vdr_actions.c
@@ -1109,11 +1109,12 @@ mgCreate::Notify() {
 
 eOSState
 mgCreate::Process(eKeys key) {
-	if (key == kOk)
+	if (key == kOk) {
 		if (Editing())
 			Execute();
-	else
-		return cMenuEditStrItem::ProcessKey(kRight);
+		else
+			return cMenuEditStrItem::ProcessKey(kRight);
+	}
 	if (key != kYellow || Editing())
 		return cMenuEditStrItem::ProcessKey(key);
 	else
diff --git a/vdr_decoder_ogg.c b/vdr_decoder_ogg.c
index b24c301..a94b5e4 100644
--- a/vdr_decoder_ogg.c
+++ b/vdr_decoder_ogg.c
@@ -105,7 +105,7 @@ mgOggFile::close () {
 
 void
 mgOggFile::error (const char *action, const int err) {
-	char *errstr;
+	const char *errstr;
 	switch (err) {
 		case OV_FALSE:
 			errstr = "false/no data available";
diff --git a/vdr_player.c b/vdr_player.c
index 60d7ed0..c3f0e90 100644
--- a/vdr_player.c
+++ b/vdr_player.c
@@ -693,7 +693,7 @@ mgPlayerControl::ShowProgress (bool open) {
 		const char *lyrics= (CurrentItem() && CurrentItem()->HasLyrics()) ? tr("Lyrics: Yes") : tr("Lyrics: No");
 		osd->DrawText( 30, lh + 3*fh + fh/2, lyrics, clrInfoTextFG2, clrInfoBG2, cFont::GetFont(fontSml), 44 * fw, fh, taLeft);
 
-		if (!selecting && changed && !statusActive || refresh) {
+		if ((!selecting && changed && !statusActive) || refresh) {
 			if (ScrollPosition==-1) {
 				snprintf(buf,sizeof(buf),"%.1f kHz, %s kbps", currItem->getSampleRate()/1000.0,currItem->getBitrate().c_str());
 				osd->DrawText( 30, lh + 2*fh + fh/2 +4, buf, clrInfoTextFG2, clrInfoBG2, SmallFont(), InfoWidth, fh, taLeft);