* The mixer node is now exported.

* The node is no longer allocated separately.
* Cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30060 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/bin/desklink/MixerControl.cpp

@@ -21,7 +21,7 @@ MixerControl::MixerControl(int32 volumeWhich, float* _value,
 		const char** _error)
 	:
 	fVolumeWhich(volumeWhich),
-	fAudioMixerNode(NULL),
+	fGainMediaNode(media_node::null),
 	fParameterWeb(NULL),
 	fMixerParameter(NULL),
 	fMin(0.0f),
@@ -29,7 +29,6 @@ MixerControl::MixerControl(int32 volumeWhich, float* _value,
 	fStep(0.0f)
 {
 	bool retrying = false;
-	fAudioMixerNode = new media_node();
 
 	status_t err = B_OK;
 		/* BMediaRoster::Roster() doesn't set it if all is ok */
@@ -56,14 +55,14 @@ retry:
 	if (roster && err == B_OK) {
 		switch (volumeWhich) {
 			case VOLUME_USE_MIXER:
-				err = roster->GetAudioMixer(fAudioMixerNode);
+				err = roster->GetAudioMixer(&fGainMediaNode);
 				break;
 			case VOLUME_USE_PHYS_OUTPUT:
-				err = roster->GetAudioOutput(fAudioMixerNode);
+				err = roster->GetAudioOutput(&fGainMediaNode);
 				break;
 		}
 		if (err == B_OK) {
-			err = roster->GetParameterWebFor(*fAudioMixerNode, &fParameterWeb);
+			err = roster->GetParameterWebFor(fGainMediaNode, &fParameterWeb);
 			if (err == B_OK) {
 				// Finding the Mixer slider in the audio output ParameterWeb 
 				int32 numParams = fParameterWeb->CountParameters();
@@ -112,11 +111,11 @@ retry:
 					p = NULL;
 				}
 				if (p == NULL) {
-					errorString = volumeWhich
+					errorString = volumeWhich ? "Could not find the soundcard"
-						? "Could not find the soundcard":"Could not find the mixer";
+						: "Could not find the mixer";
 				} else if (p->Type() != BParameter::B_CONTINUOUS_PARAMETER) {
-					errorString = volumeWhich
+					errorString = volumeWhich ? "Soundcard control unknown"
-						? "Soundcard control unknown":"Mixer control unknown";
+						: "Mixer control unknown";
 				} else {
 					fMixerParameter = dynamic_cast<BContinuousParameter*>(p);
 					fMin = fMixerParameter->MinValue();
@@ -150,10 +149,9 @@ retry:
 		errorString = "No Media Roster";
 	}
 
-	if (err != B_OK) {
+	if (err != B_OK)
-		delete fAudioMixerNode;
+		fGainMediaNode = media_node::null;
-		fAudioMixerNode = NULL;
+
-	}
 	if (errorString) {
 		fprintf(stderr, "MixerControl: %s.\n", errorString);
 		if (_error)
@@ -169,8 +167,8 @@ MixerControl::~MixerControl()
 	delete fParameterWeb;
 
 	BMediaRoster* roster = BMediaRoster::CurrentRoster();
-	if (roster != NULL && fAudioMixerNode != NULL)
+	if (roster != NULL && fGainMediaNode != media_node::null)
-		roster->ReleaseNode(*fAudioMixerNode);
+		roster->ReleaseNode(fGainMediaNode);
 }
 
 

src/bin/desklink/MixerControl.h

@@ -37,9 +37,11 @@ public:
 			float			Minimum() const { return fMin; }
 			float			Maximum() const { return fMax; }
 
+			media_node		GainNode() { return fGainMediaNode; }
+
 private:
 			int32			fVolumeWhich;
-			media_node*		fAudioMixerNode;
+			media_node		fGainMediaNode;
 			BParameterWeb*	fParameterWeb;
 			BContinuousParameter* fMixerParameter;
 			float			fMin;