From ae4ebbcca62e1f32933c3e6846c20b2ff5044af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Fri, 6 Jun 2008 13:07:02 +0000
Subject: [PATCH] * Use NULL instead of 0 for some pointer initializations. *
 Slightly more debug output for failed atempts to create a decoder.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25825 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/media/MediaExtractor.cpp |  7 +++++--
 src/kits/media/MediaTrack.cpp     | 14 ++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/kits/media/MediaExtractor.cpp b/src/kits/media/MediaExtractor.cpp
index 1fa40c0c22..fd3f05d8f0 100644
--- a/src/kits/media/MediaExtractor.cpp
+++ b/src/kits/media/MediaExtractor.cpp
@@ -21,7 +21,7 @@ MediaExtractor::MediaExtractor(BDataIO *source, int32 flags)
 {
 	CALLED();
 	fSource = source;
-	fStreamInfo = 0;
+	fStreamInfo = NULL;
 	fExtractorThread = -1;
 	fExtractorWaitSem = -1;
 	fTerminateExtractor = false;
@@ -276,8 +276,11 @@ MediaExtractor::CreateDecoder(int32 stream, Decoder **out_decoder,
 	res = _plugin_manager.CreateDecoder(&decoder,
 		fStreamInfo[stream].encodedFormat);
 	if (res != B_OK) {
+		char formatString[256];
+		string_for_format(&fStreamInfo[stream].encodedFormat, formatString,
+			256);
 		ERROR("MediaExtractor::CreateDecoder _plugin_manager.CreateDecoder "
-			"failed for stream %ld\n", stream);
+			"failed for stream %ld, format: %s\n", stream, formatString);
 		return res;
 	}
 
diff --git a/src/kits/media/MediaTrack.cpp b/src/kits/media/MediaTrack.cpp
index 5f8b010b51..28d08517f2 100644
--- a/src/kits/media/MediaTrack.cpp
+++ b/src/kits/media/MediaTrack.cpp
@@ -708,11 +708,13 @@ BMediaTrack::BMediaTrack(BPrivate::media::MediaExtractor *extractor,
 	fErr = B_OK;
 	
 	SetupWorkaround();
-	
-	if (fExtractor->CreateDecoder(fStream, &fDecoder, &fMCI) != B_OK) {
-		TRACE("BMediaTrack::BMediaTrack: Error: creating decoder failed\n");
+
+	status_t ret = fExtractor->CreateDecoder(fStream, &fDecoder, &fMCI);
+	if (ret != B_OK) {
+		TRACE("BMediaTrack::BMediaTrack: Error: creating decoder failed: "
+			"%s\n", strerror(ret));
 		// we do not set fErr here, because ReadChunk should still work
-		fDecoder = 0;
+		fDecoder = NULL;
 		return;
 	}
 
@@ -720,9 +722,9 @@ BMediaTrack::BMediaTrack(BPrivate::media::MediaExtractor *extractor,
 	fCurTime = 0;
 	
 	// not used:
-	fEncoder = 0;
+	fEncoder = NULL;
 	fEncoderID = 0;
-	fWriter = 0;
+	fWriter = NULL;
 }