From 3a8771cf17d86244a6e8ede265168a1f073bb7ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Sun, 19 Sep 2010 12:02:00 +0000
Subject: [PATCH]  * Use duration_to_string() to write better playing time   
 attribute strings (i.e. with separate hour).  * Write video bitrate
 attribute.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38718 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/mediaplayer/MainWin.cpp | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp
index 30208e7a25..774b4d15a0 100644
--- a/src/apps/mediaplayer/MainWin.cpp
+++ b/src/apps/mediaplayer/MainWin.cpp
@@ -49,6 +49,7 @@
 
 #include "AudioProducer.h"
 #include "ControllerObserver.h"
+#include "DurationToString.h"
 #include "FilePlaylistItem.h"
 #include "MainApp.h"
 #include "PeakView.h"
@@ -2337,20 +2338,20 @@ MainWin::_UpdatePlaylistItemFile()
 		time_t duration = fController->TimeDuration() / 1000000L;
 
 		char text[256];
-		snprintf(text, sizeof(text), "%02ld:%02ld", duration / 60,
-			duration % 60);
+		duration_to_string(duration, text, sizeof(text));
 		node.WriteAttr(kDurationAttrName, B_STRING_TYPE, 0, text,
 			strlen(text) + 1);
 	}
 
 	// Write audio bitrate
-	if (fHasAudio && !fHasVideo) {
+	if (fHasAudio) {
 		status = node.GetAttrInfo("Audio:Bitrate", &info);
 		if (status != B_OK || info.size == 0) {
 			media_format format;
 			if (fController->GetEncodedAudioFormat(&format) == B_OK
 				&& format.type == B_MEDIA_ENCODED_AUDIO) {
-				int32 bitrate = (int32)(format.u.encoded_audio.bit_rate / 1000);
+				int32 bitrate = (int32)(format.u.encoded_audio.bit_rate
+					/ 1000);
 				char text[256];
 				snprintf(text, sizeof(text), "%ld kbit", bitrate);
 				node.WriteAttr("Audio:Bitrate", B_STRING_TYPE, 0, text,
@@ -2359,6 +2360,23 @@ MainWin::_UpdatePlaylistItemFile()
 		}
 	}
 
+	// Write video bitrate
+	if (fHasVideo) {
+		status = node.GetAttrInfo("Video:Bitrate", &info);
+		if (status != B_OK || info.size == 0) {
+			media_format format;
+			if (fController->GetEncodedVideoFormat(&format) == B_OK
+				&& format.type == B_MEDIA_ENCODED_VIDEO) {
+				int32 bitrate = (int32)(format.u.encoded_video.avg_bit_rate
+					/ 1000);
+				char text[256];
+				snprintf(text, sizeof(text), "%ld kbit", bitrate);
+				node.WriteAttr("Video:Bitrate", B_STRING_TYPE, 0, text,
+					strlen(text) + 1);
+			}
+		}
+	}
+
 	_UpdateAttributesMenu(node);
 }