From 44820a5d881d22f36c6b432b526b60211e0fbec8 Mon Sep 17 00:00:00 2001 From: David McPaul Date: Mon, 16 Jun 2008 13:22:50 +0000 Subject: [PATCH] Correct error message and minor layout changes to InfoWin git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25972 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/mediaplayer/InfoWin.cpp | 6 +++--- src/apps/mediaplayer/media_node_framework/NodeManager.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/apps/mediaplayer/InfoWin.cpp b/src/apps/mediaplayer/InfoWin.cpp index dabc3ef614..64af6f7834 100644 --- a/src/apps/mediaplayer/InfoWin.cpp +++ b/src/apps/mediaplayer/InfoWin.cpp @@ -241,7 +241,7 @@ printf("InfoWin::Update(0x%08lx)\n", which); media_raw_video_format videoFormat; err = fController->GetEncodedVideoFormat(&format); if (err < B_OK) { - s << "(" << strerror(err) << ")"; + s << "(" << strerror(err) << ")\n"; } else if (format.type == B_MEDIA_ENCODED_VIDEO) { videoFormat = format.u.encoded_video.output; media_codec_info mci; @@ -276,7 +276,7 @@ printf("InfoWin::Update(0x%08lx)\n", which); //string_for_format(format, buf, sizeof(buf)); //printf("%s\n", buf); if (err < 0) { - s << "(" << strerror(err) << ")"; + s << "(" << strerror(err) << ")\n"; } else if (format.type == B_MEDIA_ENCODED_AUDIO) { audioFormat = format.u.encoded_audio.output; media_codec_info mci; @@ -306,7 +306,7 @@ printf("InfoWin::Update(0x%08lx)\n", which); else if (channelCount == 2) s << "Stereo"; else - s << channelCount << "Channels"; + s << channelCount << " Channels"; s << ", "; if (sr > 0.0) s << sr / 1000; diff --git a/src/apps/mediaplayer/media_node_framework/NodeManager.cpp b/src/apps/mediaplayer/media_node_framework/NodeManager.cpp index a0174fa572..704cc16091 100644 --- a/src/apps/mediaplayer/media_node_framework/NodeManager.cpp +++ b/src/apps/mediaplayer/media_node_framework/NodeManager.cpp @@ -270,11 +270,10 @@ printf("NodeManager::_SetUpNodes()\n"); // setup the audio nodes fStatus = _SetUpAudioNodes(); if (fStatus != B_OK) { - print_error("Error setting up video nodes", fStatus); + print_error("Error setting up audio nodes", fStatus); fMediaRoster->Unlock(); return fStatus; } - // we're done mocking with the media roster fMediaRoster->Unlock();