Merge pull request #74 from vishalduggal/timob-11884-30X

[TIMOB-11884] Set correct max value
appcelerator-developer-relations · Nov 28, 2012 · b5c5450 · b5c5450
2 parents fd5d28c + 113cc38
commit b5c5450
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/Resources/ui/common/phone/sound_file.js b/Resources/ui/common/phone/sound_file.js
@@ -1,6 +1,7 @@
 function sound_file() {
 	var win = Titanium.UI.createWindow();
 
+	var timob7502fix = ((Ti.version >= '3.0.0') && (Titanium.Platform.name == 'iPhone OS'));
 	var file = Titanium.Filesystem.getFile(Titanium.Filesystem.resourcesDirectory,'etc/cricket.wav');
 
 	// load from file object
@@ -19,7 +20,12 @@ function sound_file() {
 	play.addEventListener('click', function()
 	{
 		sound.play();
-		pb.max = sound.duration;
+		if (timob7502fix) {
+			pb.max = sound.duration*1000;
+		}
+		else {
+			pb.max = sound.duration;
+		}
 	});
 	win.add(play);
 

diff --git a/Resources/ui/common/phone/sound_file_url.js b/Resources/ui/common/phone/sound_file_url.js
@@ -1,6 +1,7 @@
 function sound_file_url() {
 	var win = Titanium.UI.createWindow();
 
+	var timob7502fix = ((Ti.version >= '3.0.0') && (Titanium.Platform.name == 'iPhone OS'));	
 	var file = Titanium.Filesystem.getFile(Titanium.Filesystem.resourcesDirectory,'etc/cricket.wav');
 	var file2 = Ti.Filesystem.getFile(Ti.Filesystem.resourcesDirectory,'etc/pop.caf');
 
@@ -20,7 +21,12 @@ function sound_file_url() {
 	play.addEventListener('click', function()
 	{
 		sound.play();
-		pb.max = sound.duration;
+		if (timob7502fix) {
+			pb.max = sound.duration*1000;
+		}
+		else {
+			pb.max = sound.duration;
+		}
 	});
 	win.add(play);
 

diff --git a/Resources/ui/common/phone/sound_local.js b/Resources/ui/common/phone/sound_local.js
@@ -5,6 +5,9 @@ function sound_local() {
 
 	var win = Titanium.UI.createWindow();
 
+	//TIMOB-7502. TIme moved to ms but duration is still reported in seconds
+	var timob7502fix = ((Ti.version >= '3.0.0') && (Titanium.Platform.name == 'iPhone OS'));
+
 	//TODO: USE OBJECT
 	var sound = Titanium.Media.createSound();
 	sound.url='/etc/cricket.wav'; // For testing #1913
@@ -22,7 +25,12 @@ function sound_local() {
 	play.addEventListener('click', function()
 	{
 		sound.play();
-		pb.max = sound.duration;
+		if (timob7502fix) {
+			pb.max = sound.duration*1000;
+		}
+		else {
+			pb.max = sound.duration;
+		}
 	});
 	win.add(play);
 

diff --git a/Resources/ui/common/phone/sound_remote_url.js b/Resources/ui/common/phone/sound_remote_url.js
@@ -1,6 +1,9 @@
 function sound_remote_url() {
 	var win = Titanium.UI.createWindow();
 	var isIOS = Titanium.Platform.name == 'iPhone OS';
+
+	//TIMOB-7502. TIme moved to ms but duration is still reported in seconds
+	var timob7502fix = ((Ti.version >= '3.0.0') && (Titanium.Platform.name == 'iPhone OS'));
 
 	var url = "http://www.archive.org/download/CelebrationWav/1.wav";
 
@@ -37,7 +40,12 @@ function sound_remote_url() {
 	play.addEventListener('click', function()
 	{
 		sound.play();
-		pb.max = sound.duration;
+		if (timob7502fix) {
+			pb.max = sound.duration*1000;
+		}
+		else {
+			pb.max = sound.duration;
+		}
 	});
 	win.add(play);