Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'dev'

  • Loading branch information...
commit 53b3d059625bde2d3f7fbf5762c6e9c5978973b8 2 parents ce6e484 + 301762e
@increpare authored
View
23 src/Bfxr_Flash.mxml
@@ -146,29 +146,6 @@
var dat:String = _fileRef.data.toString();
main.onLoadSettings(dat);
_fileRef = null;
- }
-
- public function clickLoadSFS():void
- {
- _fileRef = new FileReference();
- _fileRef.addEventListener(Event.SELECT, onSelectSFSSettings);
- _fileRef.browse([new FileFilter("Sfxr SFX Sample Files (*.sfs)", "*.sfs")]);
- }
-
- private function onSelectSFSSettings(e:Event):void
- {
- _fileRef.cancel();
-
- _fileRef.removeEventListener(Event.SELECT, onSelectSFSSettings);
- _fileRef.addEventListener(Event.COMPLETE, onLoadSFSSettings);
- _fileRef.load();
- }
-
- private function onLoadSFSSettings(e:Event):void
- {
- _fileRef.removeEventListener(Event.COMPLETE, onLoadSFSSettings);
- main.onLoadSFSSettings(_fileRef.data);
- _fileRef = null;
}
</fx:Script>
View
2  src/com/increpare/bfxr/synthesis/Mixer/MixerPlayer.as
@@ -269,7 +269,7 @@ package com.increpare.bfxr.synthesis.Mixer
PrepareMixForPlay();
- var ww:WaveWriter = new WaveWriter(true,32);
+ var ww:WaveWriter = new WaveWriter(true,16);
ww.addSamples(_waveData);
ww.finalize();
View
2  src/com/increpare/bfxr/synthesis/Synthesizer/SfxrSynth.as
@@ -1194,7 +1194,7 @@
public function getWavFile():ByteArray
{
stop();
- var ww:WaveWriter = new WaveWriter(true,32);
+ var ww:WaveWriter = new WaveWriter(true,16);
var cw:ByteArray = cachedWave;
ww.addSamples(cw);
ww.finalize();
View
2  src/com/increpare/bfxr_interface/components/AboutPanel.mxml
@@ -39,7 +39,7 @@
<mx:LinkButton x="10" y="140" label="analytic@gmail.com" color="#0000FF" paddingLeft="0" paddingRight="0" click="clickMail(event)"/>
<mx:LinkButton x="11" y="194" label="http://www.superflashbros.net/as3sfxr/" color="#0000FF" paddingLeft="0" paddingRight="0" click="linkClick(event)"/>
<mx:LinkButton x="11" y="243" label="http://www.drpetter.se/project_sfxr.html" color="#0000FF" paddingLeft="0" paddingRight="0" click="linkClick(event)"/>
- <s:Label x="10" y="49" text="Version 1.3"/>
+ <s:Label x="10" y="49" text="Version 1.3.2"/>
<s:Label x="10" y="98" text="By increpare:"/>
<s:Label x="11" y="174" text="Based on as3sfxr:"/>
<s:Label x="11" y="223" text="Which is based on Sfxr:"/>
View
21 src/com/increpare/bfxr_interface/components/Bfxr_interface.mxml
@@ -977,9 +977,6 @@
Alert.OK);
break;
}
- case 2:
- parentApplication.clickLoadSFS();
- break;
}
}
@@ -1017,7 +1014,7 @@
this.saveManager.RefreshSaveWithAppData();
- synthInterface.OnParameterChanged(true, false);
+ synthInterface.OnParameterChanged(false, false);
this.soundList.selectedIndex=globalState.selectedSoundItemID;
this.mixesList.selectedIndex=globalState.selectedLayerItemID;
@@ -1034,20 +1031,7 @@
}
- /**
- * Once loaded, passes the file to the synthesizer to parse
- * @param e Complete event
- */
- public function onLoadSFSSettings(dat:ByteArray):void
- {
-
- if (dat==null)
- return;
-
- synthInterface.DeserializeSFS(dat);
- tabs.selectedIndex = 0;
- }
-
+
//doesn't change list selections
private function OnGlobalParameterChanged():void
{
@@ -1350,7 +1334,6 @@
<root>
<editItem label="Load"/>
<editItem label="Load All"/>
- <editItem label="Import .sfs"/>
</root>
</fx:XML>
<fx:XML format="e4x" id="saveoptions">
Please sign in to comment.
Something went wrong with that request. Please try again.