[Drdivx-commits] SF.net SVN: drdivx: [572] DrDivX/trunk/drdivx2

[<har...@us...>]

Revision: 572
          http://svn.sourceforge.net/drdivx/?rev=572&view=rev
Author:   harikrishnan_v
Date:     2006-10-03 14:39:20 -0700 (Tue, 03 Oct 2006)

Log Message:
-----------
Use AUDIO_TRACK_BITRATE_PROP to be consistent with attribute naming scheme

Modified Paths:
--------------
    DrDivX/trunk/drdivx2/include/PropertyID.h
    DrDivX/trunk/drdivx2/src/analyzer/PortableAnalyzerImpl.cpp
    DrDivX/trunk/drdivx2/src/gui/AdvancedSettingsWidget.cpp
    DrDivX/trunk/drdivx2/src/profile/FitFileSizeProfileBundleBuilder.cpp
    DrDivX/trunk/drdivx2/src/profile/QualityProfileBundleBuilder.cpp
    DrDivX/trunk/drdivx2/src/property/resource.h

Modified: DrDivX/trunk/drdivx2/include/PropertyID.h
===================================================================
--- DrDivX/trunk/drdivx2/include/PropertyID.h	2006-10-03 21:21:49 UTC (rev 571)
+++ DrDivX/trunk/drdivx2/include/PropertyID.h	2006-10-03 21:39:20 UTC (rev 572)
@@ -45,7 +45,7 @@
 const std::string AUDIO_TRACK_SAMPLE_COUNT_PROP = "AudioSampleCount";
 const std::string AUDIO_TRACK_CHANNEL_COUNT_PROP = "AudioChannelCount";
 const std::string AUDIO_TRACK_SAMPLE_RATE_PROP = "AudioSampleRate";
-const std::string AUDIO_TRACK_AVERAGE_DATA_RATE_PROP = "AudioAverageDataRate";
+const std::string AUDIO_TRACK_BITRATE_PROP = "AudioBitrate";
 const std::string AUDIO_TRACK_BLOCK_ALIGNMENT_PROP = "AudioBlockAlignment";
 const std::string AUDIO_TRACK_BITS_PER_SAMPLE_PROP = "AudioBitsPerSample";
 const std::string AUDIO_TRACK_COMPRESSION_PROP = "AudioCompression";

Modified: DrDivX/trunk/drdivx2/src/analyzer/PortableAnalyzerImpl.cpp
===================================================================
--- DrDivX/trunk/drdivx2/src/analyzer/PortableAnalyzerImpl.cpp	2006-10-03 21:21:49 UTC (rev 571)
+++ DrDivX/trunk/drdivx2/src/analyzer/PortableAnalyzerImpl.cpp	2006-10-03 21:39:20 UTC (rev 572)
@@ -1149,7 +1149,7 @@
 					assert(err == noErr);
 
 					// Set average data rate property
-					err = CreateProperty(AUDIO_TRACK_AVERAGE_DATA_RATE_PROP, &p1);
+					err = CreateProperty(AUDIO_TRACK_BITRATE_PROP, &p1);
 					assert(err == noErr);
 					assert(p1 != NULL);
 

Modified: DrDivX/trunk/drdivx2/src/gui/AdvancedSettingsWidget.cpp
===================================================================
--- DrDivX/trunk/drdivx2/src/gui/AdvancedSettingsWidget.cpp	2006-10-03 21:21:49 UTC (rev 571)
+++ DrDivX/trunk/drdivx2/src/gui/AdvancedSettingsWidget.cpp	2006-10-03 21:39:20 UTC (rev 572)
@@ -353,7 +353,7 @@
 		return;
 
 	IProperty *property = NULL;
-	currAudTrack->GetProperty(AUDIO_TRACK_AVERAGE_DATA_RATE_PROP, &property);
+	currAudTrack->GetProperty(AUDIO_TRACK_BITRATE_PROP, &property);
 	uint32_t inAudBitrate = PropertyHelper::GetUInt32Value(property);
 
 	ui.audioBitrateComboBox->clear();
@@ -1096,7 +1096,7 @@
 		ui.audioTrackSelectionComboBox->addItem(value);
 
 		IProperty *prop = NULL;
-		track->GetProperty(AUDIO_TRACK_AVERAGE_DATA_RATE_PROP, &prop);
+		track->GetProperty(AUDIO_TRACK_BITRATE_PROP, &prop);
 		PropertyValue propVal;
 		prop->GetValue(propVal);
 		ui.audioTrackSelectionComboBox->setItemData(i, QVariant(propVal.uint32Val), Qt::UserRole);

Modified: DrDivX/trunk/drdivx2/src/profile/FitFileSizeProfileBundleBuilder.cpp
===================================================================
--- DrDivX/trunk/drdivx2/src/profile/FitFileSizeProfileBundleBuilder.cpp	2006-10-03 21:21:49 UTC (rev 571)
+++ DrDivX/trunk/drdivx2/src/profile/FitFileSizeProfileBundleBuilder.cpp	2006-10-03 21:39:20 UTC (rev 572)
@@ -440,7 +440,7 @@
 					audioTrack->GetProperty(AUDIO_TRACK_SAMPLE_RATE_PROP, &property);
 					audSamplingRate = PropertyHelper::GetUInt32Value(property);
 
-					audioTrack->GetProperty(AUDIO_TRACK_AVERAGE_DATA_RATE_PROP, &property);
+					audioTrack->GetProperty(AUDIO_TRACK_BITRATE_PROP, &property);
 					audBitrate = PropertyHelper::GetUInt32Value(property);
 				}
 

Modified: DrDivX/trunk/drdivx2/src/profile/QualityProfileBundleBuilder.cpp
===================================================================
--- DrDivX/trunk/drdivx2/src/profile/QualityProfileBundleBuilder.cpp	2006-10-03 21:21:49 UTC (rev 571)
+++ DrDivX/trunk/drdivx2/src/profile/QualityProfileBundleBuilder.cpp	2006-10-03 21:39:20 UTC (rev 572)
@@ -446,7 +446,7 @@
 				audioTrack->GetProperty(AUDIO_TRACK_SAMPLE_RATE_PROP, &property);
 				audSamplingRate = PropertyHelper::GetUInt32Value(property);
 
-				audioTrack->GetProperty(AUDIO_TRACK_AVERAGE_DATA_RATE_PROP, &property);
+				audioTrack->GetProperty(AUDIO_TRACK_BITRATE_PROP, &property);
 				audBitrate = PropertyHelper::GetUInt32Value(property);
 			}
 		}

Modified: DrDivX/trunk/drdivx2/src/property/resource.h
===================================================================
--- DrDivX/trunk/drdivx2/src/property/resource.h	2006-10-03 21:21:49 UTC (rev 571)
+++ DrDivX/trunk/drdivx2/src/property/resource.h	2006-10-03 21:39:20 UTC (rev 572)
@@ -21,7 +21,7 @@
 	<property name=\"AudioSampleCount\" type=\"uint32\"/> \
 	<property name=\"AudioChannelCount\" type=\"uint16\"/> \
 	<property name=\"AudioSampleRate\" type=\"uint32\"/> \
-	<property name=\"AudioAverageDataRate\" type=\"uint32\"/> \
+	<property name=\"AudioBitrate\" type=\"uint32\"/> \
 	<property name=\"AudioBlockAlignment\" type=\"uint16\"/> \
 	<property name=\"AudioBitsPerSample\" type=\"uint16\"/> \
 	<property name=\"AudioCompression\" type=\"string\"/> \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.