From 8feaf84b2439d8e9e321354939a5ec61da0a6ebc Mon Sep 17 00:00:00 2001
From: "J. Alexander Treuman" <jat@spatialrift.net>
Date: Sat, 9 Jun 2007 19:19:33 +0000
Subject: Tidying up some code.

git-svn-id: https://svn.musicpd.org/mpd/trunk@6527 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/audioOutput.c | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/audioOutput.c b/src/audioOutput.c
index 579bdd911..03a5ed782 100644
--- a/src/audioOutput.c
+++ b/src/audioOutput.c
@@ -155,36 +155,29 @@ int openAudioOutput(AudioOutput * audioOutput, AudioFormat * audioFormat)
 {
 	int ret = 0;
 
-	if (audioOutput->open) 
-	{
-		if (0==cmpAudioFormat(audioFormat, &audioOutput->inAudioFormat))
-		{
-			return 0;
-		}
+	if (audioOutput->open &&
+	    0 == cmpAudioFormat(audioFormat, &audioOutput->inAudioFormat)) {
+		return 0;
 	}
 
 	copyAudioFormat(&audioOutput->inAudioFormat, audioFormat);
 
-	if (audioOutput->convertAudioFormat) 
-	{
+	if (audioOutput->convertAudioFormat) {
 		copyAudioFormat(&audioOutput->outAudioFormat,
-				&audioOutput->reqAudioFormat);
-	} 
-	else 
-	{
+		                &audioOutput->reqAudioFormat);
+	} else {
 		copyAudioFormat(&audioOutput->outAudioFormat,
-				&audioOutput->inAudioFormat);
-		if (audioOutput->open) closeAudioOutput(audioOutput);
+		                &audioOutput->inAudioFormat);
+		if (audioOutput->open)
+			closeAudioOutput(audioOutput);
 	}
 
 	if (!audioOutput->open)
-	{
 		ret = audioOutput->openDeviceFunc(audioOutput);
-	}
 
 	audioOutput->sameInAndOutFormats =
 		!cmpAudioFormat(&audioOutput->inAudioFormat,
-			   	&audioOutput->outAudioFormat);
+		                &audioOutput->outAudioFormat);
 
 	return ret;
 }
-- 
cgit v1.2.3