Merge pull request #1209 from Azaezel/alpha41/simplifySoundSlots

Alpha41/simplify sound slots

Engine/source/T3D/assets/SoundAsset.cpp

@@ -173,7 +173,7 @@ SoundAsset::SoundAsset()
    mPlaylist.mRandomMode = SFXPlayList::RANDOM_NotRandom;
    mPlaylist.mTrace = false;
    mPlaylist.mLoopMode = SFXPlayList::LOOP_All;
-   mPlaylist.mActiveSlots = 12;
+   mPlaylist.mActiveSlots = 1;
 
 }
 
@@ -190,9 +190,10 @@ void SoundAsset::initPersistFields()
    docsURL;
    // Call parent.
    Parent::initPersistFields();
+   addGroup("SoundSlots");
    addArray("slots", SFXPlayList::SFXPlaylistSettings::NUM_SLOTS);
       addProtectedField("soundFile", TypeAssetLooseFilePath, Offset(mSoundFile, SoundAsset),
-         &_setSoundFile, &_getSoundFile, SFXPlayList::SFXPlaylistSettings::NUM_SLOTS, "Path to the sound file.");
+         &_setSoundFile, &defaultProtectedGetFn, SFXPlayList::SFXPlaylistSettings::NUM_SLOTS, "Path to the sound file.");
 
       addField("replay", TYPEID< SFXPlayList::EReplayMode >(), Offset(mPlaylist.mSlots.mReplayMode, SoundAsset), SFXPlayList::SFXPlaylistSettings::NUM_SLOTS,
          "Behavior when an already playing sound is encountered on this slot from a previous cycle.\n"
@@ -263,7 +264,9 @@ void SoundAsset::initPersistFields()
          "Behavior when assigned state is deactivated while slot is playing.\n\n"
          "@ref SFXPlayList_states");
    endArray("slots");
+   endGroup("SoundSlots");
 
+   addGroup("General Profile");
    addField("pitchAdjust", TypeF32, Offset(mProfileDesc.mPitch, SoundAsset), "Adjustment of the pitch value 1 is default.");
    addField("volumeAdjust", TypeF32, Offset(mProfileDesc.mVolume, SoundAsset), "Adjustment to the volume.");
    addField("is3D", TypeBool, Offset(mProfileDesc.mIs3D, SoundAsset), "Set this sound to 3D.");
@@ -274,6 +277,7 @@ void SoundAsset::initPersistFields()
    addField("useHardware", TypeBool, Offset(mProfileDesc.mUseHardware, SoundAsset), "Use hardware mixing for this sound.");
    addField("sourceGroup", TypeSFXSourceName, Offset(mProfileDesc.mSourceGroup, SoundAsset), "Group that sources playing with this description should be put into.");
    addField("preload", TypeBool, Offset(mPreload, SoundAsset), "Whether to preload sound data when the profile is added to system.");
+   endGroup("General Profile");
 
    addGroup("Fading");
       addField("fadeInTime", TypeF32, Offset(mProfileDesc.mFadeInTime, SoundAsset), "Number of seconds to gradually fade in volume from zero when playback starts.");
@@ -321,6 +325,8 @@ void SoundAsset::initializeAsset(void)
          break;
 
       mSoundPath[i] = getOwned() ? expandAssetFilePath(mSoundFile[i]) : mSoundPath[i];
+      if (!Torque::FS::IsFile(mSoundPath[i]))
+         Con::errorf("SoundAsset::initializeAsset (%s)[%d] could not find %s!", getAssetName(), i, mSoundPath[i]);
    }
 }
 
@@ -437,32 +443,22 @@ U32 SoundAsset::load()
    return mLoadedState;
 }
 
-StringTableEntry SoundAsset::getSoundFile(const char* pSoundFile, const U32 slotId)
+bool SoundAsset::_setSoundFile(void* object, const char* index, const char* data)
 {
-   for (U32 i = 0; i < 12; i++)
-   {
-      if(mSoundFile[i] == pSoundFile)
-         return mSoundFile[i];
-   }
-}
-
-void SoundAsset::setSoundFile(const char* pSoundFile, const U32 slotId)
-{
-   // Sanity!
-   AssertFatal(pSoundFile != NULL, "Cannot use a NULL sound file.");
-
-   // Fetch sound file.
-   pSoundFile = StringTable->insert(pSoundFile, true);
+   SoundAsset* pData = static_cast<SoundAsset*>(object);
 
-   //Ignore no change,
-   if (pSoundFile == mSoundFile[slotId])
-      return;
+   U32 id = 0;
+   if (index)
+      id = dAtoui(index);
 
    // Update.
-   mSoundFile[slotId] = getOwned() ? expandAssetFilePath(pSoundFile) : pSoundFile;
+   pData->mSoundFile[id] = StringTable->insert(data, true);
+   if (pData->mSoundFile[id] == StringTable->EmptyString())
+      pData->mSoundPath[id] = StringTable->EmptyString();
 
    // Refresh the asset.
-   refreshAsset();
+   pData->refreshAsset();
+   return true;
 }
 
 StringTableEntry SoundAsset::getAssetIdByFileName(StringTableEntry fileName)

Engine/source/T3D/assets/SoundAsset.h

@@ -87,9 +87,9 @@ class SoundAsset : public AssetBase
    typedef AssetPtr<SoundAsset> ConcreteAssetPtr;
 
 protected:
-   StringTableEntry        mSoundFile[12];
-   StringTableEntry        mSoundPath[12];
-   SFXProfile              mSFXProfile[12];
+   StringTableEntry        mSoundFile[SFXPlayList::SFXPlaylistSettings::NUM_SLOTS];
+   StringTableEntry        mSoundPath[SFXPlayList::SFXPlaylistSettings::NUM_SLOTS];
+   SFXProfile              mSFXProfile[SFXPlayList::SFXPlaylistSettings::NUM_SLOTS];
 
    SFXDescription          mProfileDesc;
    SFXPlayList             mPlaylist;
@@ -155,9 +155,8 @@ public:
    /// Declare Console Object.
    DECLARE_CONOBJECT(SoundAsset);
 
-   void setSoundFile(const char* pSoundFile, const U32 slotId = 0);
+   static bool _setSoundFile(void* object, const char* index, const char* data);
    U32 load();
-   StringTableEntry getSoundFile(const char* pSoundFile, const U32 slotId = 0);
    inline StringTableEntry getSoundPath(const U32 slotId = 0) const { return mSoundPath[slotId]; };
    SFXProfile* getSfxProfile(const U32 slotId = 0) { return &mSFXProfile[slotId]; }
    SFXPlayList* getSfxPlaylist() { return &mPlaylist; }
@@ -176,9 +175,6 @@ protected:
    virtual void            initializeAsset(void);
    void _onResourceChanged(const Torque::Path & path);
    virtual void            onAssetRefresh(void);
-
-  static bool _setSoundFile(void *obj, const char *index, const char *data) { static_cast<SoundAsset*>(obj)->setSoundFile(data, index ? dAtoi(index) : 0); return false; }
-  static const char* _getSoundFile(void* obj, const char* data) { return static_cast<SoundAsset*>(obj)->getSoundFile(data); }
 };
 
 DefineConsoleType(TypeSoundAssetPtr, SoundAsset)

Engine/source/T3D/assets/assetImporter.cpp

@@ -3345,8 +3345,8 @@ Torque::Path AssetImporter::importSoundAsset(AssetImportObject* assetItem)
 
    StringTableEntry assetName = StringTable->insert(assetItem->assetName.c_str());
 
-   String imageFileName = assetItem->filePath.getFileName() + "." + assetItem->filePath.getExtension();
-   String assetPath = targetPath + "/" + imageFileName;
+   String soundFileName = assetItem->filePath.getFileName() + "." + assetItem->filePath.getExtension();
+   String assetPath = targetPath + "/" + soundFileName;
    String tamlPath = targetPath + "/" + assetName + ".asset.taml";
    String originalPath = assetItem->filePath.getFullPath().c_str();
 
@@ -3362,7 +3362,7 @@ Torque::Path AssetImporter::importSoundAsset(AssetImportObject* assetItem)
 #endif
 
    newAsset->setAssetName(assetName);
-   newAsset->setSoundFile(imageFileName.c_str());
+   newAsset->_setSoundFile(newAsset, "0", soundFileName.c_str());
 
    //If it's not a re-import, check that the file isn't being in-place imported. If it isn't, store off the original
    //file path for reimporting support later

Engine/source/sfx/sfxSource.cpp

@@ -277,7 +277,8 @@ SFXSource::SFXSource( SFXTrack* track, SFXDescription* description )
       
    if( mTrack != NULL )
       deleteNotify( mTrack );
-   deleteNotify( mDescription );
+   if (mDescription != NULL)
+      deleteNotify( mDescription );
 }
 
 //-----------------------------------------------------------------------------