added basic sound table

apps/opencs/model/world/data.cpp

@@ -77,12 +77,16 @@ CSMWorld::Data::Data()
     mRaces.addColumn (new WeightHeightColumn<ESM::Race> (false, true));
     mRaces.addColumn (new WeightHeightColumn<ESM::Race> (false, false));
 
+    mSounds.addColumn (new StringIdColumn<ESM::Sound>);
+    mSounds.addColumn (new RecordStateColumn<ESM::Sound>);
+
     addModel (new IdTable (&mGlobals), UniversalId::Type_Globals, UniversalId::Type_Global);
     addModel (new IdTable (&mGmsts), UniversalId::Type_Gmsts, UniversalId::Type_Gmst);
     addModel (new IdTable (&mSkills), UniversalId::Type_Skills, UniversalId::Type_Skill);
     addModel (new IdTable (&mClasses), UniversalId::Type_Classes, UniversalId::Type_Class);
     addModel (new IdTable (&mFactions), UniversalId::Type_Factions, UniversalId::Type_Faction);
     addModel (new IdTable (&mRaces), UniversalId::Type_Races, UniversalId::Type_Race);
+    addModel (new IdTable (&mSounds), UniversalId::Type_Sounds, UniversalId::Type_Sound);
 }
 
 CSMWorld::Data::~Data()
@@ -151,6 +155,16 @@ CSMWorld::IdCollection<ESM::Race>& CSMWorld::Data::getRaces()
     return mRaces;
 }
 
+const CSMWorld::IdCollection<ESM::Sound>& CSMWorld::Data::getSounds() const
+{
+    return mSounds;
+}
+
+CSMWorld::IdCollection<ESM::Sound>& CSMWorld::Data::getSounds()
+{
+    return mSounds;
+}
+
 QAbstractItemModel *CSMWorld::Data::getTableModel (const UniversalId& id)
 {
     std::map<UniversalId::Type, QAbstractItemModel *>::iterator iter = mModelIndex.find (id.getType());
@@ -191,6 +205,7 @@ void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base)
             case ESM::REC_CLAS: mClasses.load (reader, base); break;
             case ESM::REC_FACT: mFactions.load (reader, base); break;
             case ESM::REC_RACE: mRaces.load (reader, base); break;
+            case ESM::REC_SOUN: mSounds.load (reader, base); break;
 
             default:
 

apps/opencs/model/world/data.hpp

@@ -12,6 +12,7 @@
 #include <components/esm/loadclas.hpp>
 #include <components/esm/loadfact.hpp>
 #include <components/esm/loadrace.hpp>
+#include <components/esm/loadsoun.hpp>
 
 #include "idcollection.hpp"
 #include "universalid.hpp"
@@ -28,6 +29,7 @@ namespace CSMWorld
             IdCollection<ESM::Class> mClasses;
             IdCollection<ESM::Faction> mFactions;
             IdCollection<ESM::Race> mRaces;
+            IdCollection<ESM::Sound> mSounds;
             std::vector<QAbstractItemModel *> mModels;
             std::map<UniversalId::Type, QAbstractItemModel *> mModelIndex;
 
@@ -68,6 +70,10 @@ namespace CSMWorld
 
             IdCollection<ESM::Race>& getRaces();
 
+            const IdCollection<ESM::Sound>& getSounds() const;
+
+            IdCollection<ESM::Sound>& getSounds();
+
             QAbstractItemModel *getTableModel (const UniversalId& id);
             ///< If no table model is available for \a id, an exception is thrown.
             ///

apps/opencs/model/world/universalid.cpp

@@ -23,6 +23,7 @@ namespace
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Classes, "Classes" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Factions, "Factions" },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Races, "Races" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Sounds, "Sounds" },
 
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0 } // end marker
     };
@@ -35,6 +36,7 @@ namespace
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Class, "Class" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Faction, "Faction" },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Race, "Race" },
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Sound, "Sound" },
 
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0 } // end marker
     };

apps/opencs/model/world/universalid.hpp

@@ -45,7 +45,9 @@ namespace CSMWorld
                 Type_Factions,
                 Type_Faction,
                 Type_Races,
-                Type_Race
+                Type_Race,
+                Type_Sounds,
+                Type_Sound
             };
 
         private:

apps/opencs/view/doc/view.cpp

@@ -105,6 +105,10 @@ void CSVDoc::View::setupWorldMenu()
     QAction *races = new QAction (tr ("Races"), this);
     connect (races, SIGNAL (triggered()), this, SLOT (addRacesSubView()));
     world->addAction (races);
+
+    QAction *sounds = new QAction (tr ("Sounds"), this);
+    connect (sounds, SIGNAL (triggered()), this, SLOT (addSoundsSubView()));
+    world->addAction (sounds);
 }
 
 void CSVDoc::View::setupUi()
@@ -280,6 +284,11 @@ void CSVDoc::View::addRacesSubView()
     addSubView (CSMWorld::UniversalId::Type_Races);
 }
 
+void CSVDoc::View::addSoundsSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_Sounds);
+}
+
 void CSVDoc::View::abortOperation (int type)
 {
     mDocument->abortOperation (type);

apps/opencs/view/doc/view.hpp

@@ -123,6 +123,8 @@ namespace CSVDoc
             void addFactionsSubView();
 
             void addRacesSubView();
+
+            void addSoundsSubView();
     };
 }
 

apps/opencs/view/world/subviews.cpp

@@ -20,6 +20,7 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Classes,
         CSMWorld::UniversalId::Type_Factions,
         CSMWorld::UniversalId::Type_Races,
+        CSMWorld::UniversalId::Type_Sounds,
 
         CSMWorld::UniversalId::Type_None // end marker
     };

components/esm/loadsoun.cpp

@@ -23,4 +23,12 @@ void Sound::save(ESMWriter &esm)
     esm.writeHNT("DATA", mData, 3);
 }
 
+    void Sound::blank()
+    {
+        mSound.clear();
+
+        mData.mVolume = 128;
+        mData.mMinRange = 0;
+        mData.mMaxRange = 256;
+    }
 }

components/esm/loadsoun.hpp

@@ -21,6 +21,9 @@ struct Sound
 
     void load(ESMReader &esm);
     void save(ESMWriter &esm);
+
+    void blank();
+    ///< Set record to default state (does not touch the ID/index).
 };
 }
 #endif