[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    [Haiku-commits] r29836 - in haiku/trunk/src: apps/mediaplayer
From:       phoudoin () mail ! berlios ! de
Date:       2009-03-31 19:16:22
Message-ID: 200903311916.n2VJGMIr009676 () sheep ! berlios ! de
[Download RAW message or body]

Author: phoudoin
Date: 2009-03-31 21:16:18 +0200 (Tue, 31 Mar 2009)
New Revision: 29836
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29836&view=rev

Modified:
   haiku/trunk/src/apps/mediaplayer/InfoWin.cpp
   haiku/trunk/src/kits/media/MediaTrack.cpp
Log:
* As suggested by Axel, BMediaTrack::GetCodecInfo() don't anymore say 
  "Haiku Media Kit: ", as it's given for any caller of a Media Kit API ;-)
* This remove an systematic line feed in the codec pretty name returned;
* Updated MediaPlayer info window text layout to take this change into account.




Modified: haiku/trunk/src/apps/mediaplayer/InfoWin.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/InfoWin.cpp	2009-03-31 19:02:04 UTC (rev 29835)
+++ haiku/trunk/src/apps/mediaplayer/InfoWin.cpp	2009-03-31 19:16:18 UTC (rev 29836)
@@ -313,7 +313,7 @@
 	status_t err;
 	// video track format information
 	if ((which & INFO_VIDEO) && fController->VideoTrackCount() > 0) {
-		fLabelsView->Insert("Video\n\n\n\n");
+		fLabelsView->Insert("Video\n\n\n");
 		BString s;
 		media_format format;
 		media_raw_video_format videoFormat;
@@ -325,9 +325,9 @@
 			media_codec_info mci;
 			err = fController->GetVideoCodecInfo(&mci);
 			if (err < B_OK) {
-				s << "Haiku Media Kit:\n(" << strerror(err) << ")";
+				s << "Haiku Media Kit: " << strerror(err);
 				if (format.user_data_type == B_CODEC_TYPE_INFO) {
-					s << (char *)format.user_data << " not supported";
+					s << (char *)format.user_data << " (not supported)";
 				}
 			} else
 				s << mci.pretty_name; //<< "(" << mci.short_name << ")";
@@ -346,7 +346,7 @@
 
 	// audio track format information
 	if ((which & INFO_AUDIO) && fController->AudioTrackCount() > 0) {
-		fLabelsView->Insert("Audio\n\n\n\n");
+		fLabelsView->Insert("Audio\n\n\n");
 		BString s;
 		media_format format;
 		media_raw_audio_format audioFormat;
@@ -360,9 +360,9 @@
 			media_codec_info mci;
 			err = fController->GetAudioCodecInfo(&mci);
 			if (err < 0) {
-				s << "Haiku Media Kit:\n(" << strerror(err) << ") ";
+				s << "Haiku Media Kit: " << strerror(err);
 				if (format.user_data_type == B_CODEC_TYPE_INFO) {
-					s << (char *)format.user_data << " not supported";
+					s << (char *)format.user_data << " (not supported)";
 				}
 			} else
 				s << mci.pretty_name; //<< "(" << mci.short_name << ")";

Modified: haiku/trunk/src/kits/media/MediaTrack.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaTrack.cpp	2009-03-31 19:02:04 UTC (rev 29835)
+++ haiku/trunk/src/kits/media/MediaTrack.cpp	2009-03-31 19:16:18 UTC (rev 29836)
@@ -109,7 +109,7 @@
 		return B_NO_INIT;
 
 	*mci = fMCI;
-	snprintf(mci->pretty_name, sizeof(mci->pretty_name), "Haiku Media Kit:\n%s", fMCI.pretty_name);
+	strlcpy(mci->pretty_name, fMCI.pretty_name, sizeof(mci->pretty_name));
 
 	return B_OK;
 }

_______________________________________________
Haiku-commits mailing list
Haiku-commits@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/haiku-commits
[prev in list] [next in list] [prev in thread] [next in thread]