i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct error message and minor layout changes to InfoWin

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25972 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
David McPaul
2008-06-16 13:22:50 +00:00
parent f54f956131
commit 44820a5d88
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/InfoWin.cpp
+3 -3
View File
@@ -241,7 +241,7 @@ printf("InfoWin::Update(0x%08lx)\n", which);
media_raw_video_format videoFormat; media_raw_video_format videoFormat;
err = fController->GetEncodedVideoFormat(&format); err = fController->GetEncodedVideoFormat(&format);
if (err < B_OK) { if (err < B_OK) {
s << "(" << strerror(err) << ")"; s << "(" << strerror(err) << ")\n";
} else if (format.type == B_MEDIA_ENCODED_VIDEO) { } else if (format.type == B_MEDIA_ENCODED_VIDEO) {
videoFormat = format.u.encoded_video.output; videoFormat = format.u.encoded_video.output;
media_codec_info mci; media_codec_info mci;
@@ -276,7 +276,7 @@ printf("InfoWin::Update(0x%08lx)\n", which);
//string_for_format(format, buf, sizeof(buf)); //string_for_format(format, buf, sizeof(buf));
//printf("%s\n", buf); //printf("%s\n", buf);
if (err < 0) { if (err < 0) {
s << "(" << strerror(err) << ")"; s << "(" << strerror(err) << ")\n";
} else if (format.type == B_MEDIA_ENCODED_AUDIO) { } else if (format.type == B_MEDIA_ENCODED_AUDIO) {
audioFormat = format.u.encoded_audio.output; audioFormat = format.u.encoded_audio.output;
media_codec_info mci; media_codec_info mci;
@@ -306,7 +306,7 @@ printf("InfoWin::Update(0x%08lx)\n", which);
else if (channelCount == 2) else if (channelCount == 2)
s << "Stereo"; s << "Stereo";
else else
s << channelCount << "Channels"; s << channelCount << " Channels";
s << ", "; s << ", ";
if (sr > 0.0) if (sr > 0.0)
s << sr / 1000; s << sr / 1000;
src/apps/mediaplayer/media_node_framework/NodeManager.cpp
+1 -2
View File
@@ -270,11 +270,10 @@ printf("NodeManager::_SetUpNodes()\n");
// setup the audio nodes // setup the audio nodes
fStatus = _SetUpAudioNodes(); fStatus = _SetUpAudioNodes();
if (fStatus != B_OK) { if (fStatus != B_OK) {
print_error("Error setting up video nodes", fStatus); print_error("Error setting up audio nodes", fStatus);
fMediaRoster->Unlock(); fMediaRoster->Unlock();
return fStatus; return fStatus;
} }
// we're done mocking with the media roster // we're done mocking with the media roster
fMediaRoster->Unlock(); fMediaRoster->Unlock();