Changeset 438

Timestamp:

09/06/08 15:14:12 (5 years ago)

Author:

comix

Message:

Buf fix: #30 (Crash after installing a new drumkit)

Location:

trunk/gui/src/SoundLibrary

Files:

• SoundLibraryPanel.cpp (modified) (3 diffs)
• SoundLibraryPanel.h (modified) (2 diffs)

trunk/gui/src/SoundLibrary/SoundLibraryPanel.cpp

@@ -41 +41 @@
 #include "../InstrumentRack.h"
 
-#include <hydrogen/LocalFileMng.h>
+#include <hydrogen/adsr.h>
+#include <hydrogen/audio_engine.h>
 #include <hydrogen/data_path.h>
-#include <hydrogen/sample.h>
-#include <hydrogen/adsr.h>
+#include <hydrogen/h2_exception.h>
 #include <hydrogen/hydrogen.h>
 #include <hydrogen/instrument.h>
-#include <hydrogen/h2_exception.h>
-#include <hydrogen/audio_engine.h>
+#include <hydrogen/LocalFileMng.h>
 #include <hydrogen/Preferences.h>
 #include <hydrogen/Pattern.h>
+#include <hydrogen/sample.h>
+#include <hydrogen/Song.h>
+#include <hydrogen/SoundLibrary.h>
+
 using namespace H2Core;
 
@@ -58 +61 @@
  : QWidget( pParent )
  , Object( "SoundLibraryPanel" )
+ , m_pSoundLibraryTree( NULL )
+ , m_pDrumkitMenu( NULL )
+ , m_pInstrumentMenu( NULL )
+ , m_pSongMenu( NULL )
+ , m_pPatternMenu( NULL )
+ , m_pPatternMenuList( NULL )
+ , m_pSystemDrumkitsItem( NULL )
+ , m_pUserDrumkitsItem( NULL )
+ , m_pSongItem( NULL )
+ , m_pPatternItem( NULL )
+ , m_pPatternItemList( NULL )
 {
         //INFOLOG( "INIT" );
-
         m_pDrumkitMenu = new QMenu( this );
         m_pDrumkitMenu->addAction( trUtf8( "Load" ), this, SLOT( on_drumkitLoadAction() ) );
@@ -746 +759 @@
 void SoundLibraryPanel::test_expandedItems()
 {
+        assert( m_pSoundLibraryTree );
         expandsongslist = m_pSoundLibraryTree->isItemExpanded( m_pSongItem );
         expandpatternlist = m_pSoundLibraryTree->isItemExpanded( m_pPatternItem );

trunk/gui/src/SoundLibrary/SoundLibraryPanel.h

@@ -30 +30 @@
 #include <vector>
 
-#include <hydrogen/Song.h>
 #include <hydrogen/Object.h>
-#include <hydrogen/SoundLibrary.h>
+
+namespace H2Core
+{
+        class Song;
+        class Drumkit;
+        class SoundLibrary;
+}
 
 class SoundLibraryTree;
@@ -39 +44 @@
 class SoundLibraryPanel : public QWidget, private Object
 {
-        Q_OBJECT
-        public:
-                SoundLibraryPanel( QWidget *pParent );
-                ~SoundLibraryPanel();
+Q_OBJECT
+public:
+        SoundLibraryPanel( QWidget *pParent );
+        ~SoundLibraryPanel();
 
-                void updateDrumkitList();
-                void test_expandedItems();
+        void updateDrumkitList();
+        void test_expandedItems();
 
-        private slots:
-                void on_DrumkitList_ItemChanged( QTreeWidgetItem * current, QTreeWidgetItem * previous );
-                void on_DrumkitList_itemActivated( QTreeWidgetItem * item, int column );
-                void on_DrumkitList_leftClicked( QPoint pos );
-                void on_DrumkitList_rightClicked( QPoint pos );
-                void on_DrumkitList_mouseMove( QMouseEvent *event );
+private slots:
+        void on_DrumkitList_ItemChanged( QTreeWidgetItem * current, QTreeWidgetItem * previous );
+        void on_DrumkitList_itemActivated( QTreeWidgetItem * item, int column );
+        void on_DrumkitList_leftClicked( QPoint pos );
+        void on_DrumkitList_rightClicked( QPoint pos );
+        void on_DrumkitList_mouseMove( QMouseEvent *event );
 
-                void on_drumkitLoadAction();
-                void on_drumkitDeleteAction();
-                void on_drumkitPropertiesAction();
-                void on_drumkitExportAction();
-                void on_instrumentDeleteAction();
-                void on_songLoadAction();
-                void on_patternLoadAction();
-                void on_patternDeleteAction();
+        void on_drumkitLoadAction();
+        void on_drumkitDeleteAction();
+        void on_drumkitPropertiesAction();
+        void on_drumkitExportAction();
+        void on_instrumentDeleteAction();
+        void on_songLoadAction();
+        void on_patternLoadAction();
+        void on_patternDeleteAction();
 
-        private:
-                SoundLibraryTree *m_pSoundLibraryTree;
-                //FileBrowser *m_pFileBrowser;
+private:
+        SoundLibraryTree *m_pSoundLibraryTree;
+        //FileBrowser *m_pFileBrowser;
 
-                QPoint m_startDragPosition;
-                QMenu* m_pDrumkitMenu;
-                QMenu* m_pInstrumentMenu;
-                QMenu* m_pSongMenu;
-                QMenu* m_pPatternMenu;
-                QMenu* m_pPatternMenuList;
+        QPoint m_startDragPosition;
+        QMenu* m_pDrumkitMenu;
+        QMenu* m_pInstrumentMenu;
+        QMenu* m_pSongMenu;
+        QMenu* m_pPatternMenu;
+        QMenu* m_pPatternMenuList;
 
-                QTreeWidgetItem* m_pSystemDrumkitsItem;
-                QTreeWidgetItem* m_pUserDrumkitsItem;
-                QTreeWidgetItem* m_pSongItem;
-                QTreeWidgetItem* m_pPatternItem;
-                QTreeWidgetItem* m_pPatternItemList;
+        QTreeWidgetItem* m_pSystemDrumkitsItem;
+        QTreeWidgetItem* m_pUserDrumkitsItem;
+        QTreeWidgetItem* m_pSongItem;
+        QTreeWidgetItem* m_pPatternItem;
+        QTreeWidgetItem* m_pPatternItemList;
 
-                std::vector<H2Core::Drumkit*> m_systemDrumkitInfoList;
-                std::vector<H2Core::Drumkit*> m_userDrumkitInfoList;
-                bool expandpatternlist;
-                bool expandsongslist;
-        
-
-
+        std::vector<H2Core::Drumkit*> m_systemDrumkitInfoList;
+        std::vector<H2Core::Drumkit*> m_userDrumkitInfoList;
+        bool expandpatternlist;
+        bool expandsongslist;
 };