Packman Build Service PMBS

lightspark.spec Changed

lightspark.tar.xz/src/backends/audio.cpp Changed

lightspark.tar.xz/src/backends/audio.h Changed

lightspark.tar.xz/src/backends/builtindecoder.cpp Changed

lightspark.tar.xz/src/backends/decoder.cpp Changed

lightspark.tar.xz/src/backends/decoder.h Changed

lightspark.tar.xz/src/backends/interfaces/audio/IAudioPlugin.cpp Changed

lightspark.tar.xz/src/backends/interfaces/audio/IAudioPlugin.h Changed

lightspark.tar.xz/src/scripting/flash/media/flashmedia.cpp Changed

lightspark.tar.xz/src/scripting/flash/net/flashnet.cpp Changed

@@ -610,7 +610,7 @@
 	c->setVariableByQName("PENDING","",Class<ASString>::getInstanceS("pending"),DECLARED_TRAIT);
 }
 
-std::map<tiny_string, SharedObject* > SharedObject::sharedobjectmap;
+std::map<tiny_string, ASObject* > SharedObject::sharedobjectmap;
 SharedObject::SharedObject(Class_base* c):EventDispatcher(c),client(this),objectEncoding(ObjectEncoding::AMF3)
 {
 	data=_MR(new_asobject());
@@ -671,18 +671,22 @@
 	
 	if (name=="")
 		throwError<ASError>(0,"invalid name");
-	if (localPath != "" || secure)
-		LOG(LOG_NOT_IMPLEMENTED,"SharedObject.getLocal: parameters 'localPath' and 'secure' are ignored");
+	if (secure)
+		LOG(LOG_NOT_IMPLEMENTED,"SharedObject.getLocal: parameter 'secure' is ignored");
 
 
-	std::map<tiny_string, SharedObject* >::iterator it = sharedobjectmap.find(name);
+	tiny_string fullname = localPath + "|";
+	fullname += name;
+	SharedObject* res = Class<SharedObject>::getInstanceS();
+	std::map<tiny_string, ASObject* >::iterator it = sharedobjectmap.find(fullname);
 	if (it == sharedobjectmap.end())
 	{
-		sharedobjectmap.insert(make_pair(name,Class<SharedObject>::getInstanceS()));
-		it = sharedobjectmap.find(name);
+		sharedobjectmap.insert(make_pair(fullname,Class<ASObject>::getInstanceS()));
+		it = sharedobjectmap.find(fullname);
 	}
 	it->second->incRef();
-	return it->second;
+	res->data = _NR<ASObject>(it->second);
+	return res;
 }
 
 ASFUNCTIONBODY(SharedObject,getRemote)
@@ -1685,6 +1689,11 @@
 	}
 	if(paused)
 		return;
+	if(audioStream && audioStream->isValid() && !audioStream->hasStarted)
+	{
+		audioStream->hasStarted = true;
+		audioStream->resume();
+	}
 	//Advance video and audio to current time, follow the audio stream time
 	countermutex.lock();
 	if(audioStream && getSys()->audioManager->isTimingAvailablePlugin())
@@ -1849,9 +1858,6 @@
 						if (frameRate)
 						{
 							this->playbackBytesPerSecond = s.tellg() / (framesdecoded / frameRate);
-							// TODO this overrides the real number of decoded frames
-							// otherwise on slow computers we never get the buffer filled
-							//framesdecoded = (this->getReceivedLength() / this->playbackBytesPerSecond) *  frameRate;
 							this->bufferLength = (framesdecoded / frameRate) - (streamTime-prevstreamtime)/1000.0;
 						}
 						countermutex.unlock();
@@ -1877,9 +1883,8 @@
 				audioDecoder=streamDecoder->audioDecoder;
 			
 			if(audioStream==NULL && audioDecoder && audioDecoder->isValid() && getSys()->audioManager->pluginLoaded())
-				audioStream=getSys()->audioManager->createStreamPlugin(audioDecoder);
-			
-			if(!tickStarted && isReady() && ((framesdecoded / frameRate) >= this->bufferTime))
+				audioStream=getSys()->audioManager->createStreamPlugin(audioDecoder,streamDecoder->hasVideo());
+			if(!tickStarted && isReady() && frameRate && ((framesdecoded / frameRate) >= this->bufferTime))
 			{
 				tickStarted=true;
 				this->incRef();
@@ -1890,7 +1895,7 @@
 				float localRenderRate=dmin(frameRate,24);
 				getSys()->setRenderRate(localRenderRate);
 			}
-			if (!bufferfull && ((framesdecoded / frameRate) >= this->bufferTime))
+			if (!bufferfull && frameRate && ((framesdecoded / frameRate) >= this->bufferTime))
 			{
 				bufferfull = true;
 				this->incRef();

lightspark.tar.xz/src/scripting/flash/net/flashnet.h Changed

lightspark.tar.xz/src/scripting/flash/ui/Mouse.cpp Changed

Changes of Revision 96