From bdb1d3ac7ca33ba647043e9e55336d4380baa769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Thu, 23 Oct 2008 21:30:19 +0000
Subject: [PATCH] * BMediaRoster::GetAudio*() should return B_NAME_NOT_FOUND
 when nothing is set * In this case, SoundRecorder shows a different error
 message, more informative, confer bug #134

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28303 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/soundrecorder/RecorderWindow.cpp |  5 ++++-
 src/servers/media/DefaultManager.cpp      | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/apps/soundrecorder/RecorderWindow.cpp b/src/apps/soundrecorder/RecorderWindow.cpp
index bc80086b71..83d6cfa2bf 100644
--- a/src/apps/soundrecorder/RecorderWindow.cpp
+++ b/src/apps/soundrecorder/RecorderWindow.cpp
@@ -125,7 +125,10 @@ RecorderWindow::RecorderWindow() :
 
 	fInitCheck = InitWindow();
 	if (fInitCheck != B_OK) {
-		ErrorAlert("connect to media server", fInitCheck);
+		if (fInitCheck == B_NAME_NOT_FOUND)
+			ErrorAlert("find default audio hardware", fInitCheck);
+		else
+			ErrorAlert("connect to media server", fInitCheck);
 		PostMessage(B_QUIT_REQUESTED);
 	} else
 		Show();
diff --git a/src/servers/media/DefaultManager.cpp b/src/servers/media/DefaultManager.cpp
index b632ab3e5e..43bcf73cd4 100644
--- a/src/servers/media/DefaultManager.cpp
+++ b/src/servers/media/DefaultManager.cpp
@@ -224,31 +224,31 @@ DefaultManager::Get(media_node_id *nodeid, char *input_name, int32 *inputid, nod
 	switch (type) {
 		case VIDEO_INPUT: 		// output: nodeid
 			if (fPhysicalVideoIn == -1)
-				return B_ERROR;
+				return B_NAME_NOT_FOUND;
 			*nodeid = fPhysicalVideoIn;
 			return B_OK;
 
 		case AUDIO_INPUT: 		// output: nodeid
 			if (fPhysicalAudioIn == -1)
-				return B_ERROR;
+				return B_NAME_NOT_FOUND;
 			*nodeid = fPhysicalAudioIn;
 			return B_OK;
 			
 		case VIDEO_OUTPUT: 		// output: nodeid
 			if (fPhysicalVideoOut == -1)
-				return B_ERROR;
+				return B_NAME_NOT_FOUND;
 			*nodeid = fPhysicalVideoOut;
 			return B_OK;
 
 		case AUDIO_OUTPUT:		// output: nodeid
 			if (fPhysicalAudioOut == -1)
-				return B_ERROR;
+				return B_NAME_NOT_FOUND;
 			*nodeid = fPhysicalAudioOut;
 			return B_OK;
 
 		case AUDIO_OUTPUT_EX:	// output: nodeid, input_name, input_id
 			if (fPhysicalAudioOut == -1)
-				return B_ERROR;
+				return B_NAME_NOT_FOUND;
 			*nodeid = fPhysicalAudioOut;
 			*inputid = fPhysicalAudioOutInputID;
 			strcpy(input_name, fPhysicalAudioOutInputName);
@@ -256,7 +256,7 @@ DefaultManager::Get(media_node_id *nodeid, char *input_name, int32 *inputid, nod
 
 		case AUDIO_MIXER:		// output: nodeid
 			if (fAudioMixer == -1)
-				return B_ERROR;
+				return B_NAME_NOT_FOUND;
 			*nodeid = fAudioMixer;
 			return B_OK;