Changeset 493

Timestamp:

09/17/08 13:25:46 (5 years ago)

Author:

wolke

Message:

small changes

Location:

branches/audiofilebrowser/gui/src/AudioFileBrowser

Files:

• AudioFileBrowser.cpp (modified) (4 diffs)
• AudioFileBrowser.h (modified) (1 diff)
• SampleWaveDisplay.cpp (modified) (2 diffs)

branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser.cpp

@@ -28 +28 @@
 #include "../widgets/Button.h"
 
+#include <hydrogen/data_path.h>
 #include <hydrogen/h2_exception.h>
 #include <hydrogen/Preferences.h>
@@ -69 +70 @@
         m_pselectedFile = "";
 
+        sEmptySampleFilename = DataPath::get_data_path() + "/emptySample.wav";
+
         m_pSampleWaveDisplay = new SampleWaveDisplay( waveformview );
-        m_pSampleWaveDisplay->updateDisplay( NULL );
+        m_pSampleWaveDisplay->updateDisplay( sEmptySampleFilename );
         m_pSampleWaveDisplay->move( 3, 3 );
 
@@ -111 +114 @@
         pathLineEdit->setText( path );
         filelineedit->setText( path );
-        m_pSampleWaveDisplay->updateDisplay( NULL );
+        m_pSampleWaveDisplay->updateDisplay( sEmptySampleFilename );
 
 
@@ -174 +177 @@
                         m_pSamplerateLable->setText( trUtf8( "Samplerate:" ) );
                         m_pLengthLable->setText( trUtf8( "Samplelength:" ) );
-                        m_pSampleWaveDisplay->updateDisplay( NULL );
+                        m_pSampleWaveDisplay->updateDisplay( sEmptySampleFilename );
                         m_pPlayBtn->setEnabled( false );
                         openBTN->setEnabled( false );

branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser.h

@@ -70 +70 @@
                 QTreeView *tree;
                 SampleWaveDisplay *m_pSampleWaveDisplay;
+                QString sEmptySampleFilename;
                 
 

branches/audiofilebrowser/gui/src/AudioFileBrowser/SampleWaveDisplay.cpp

@@ -95 +95 @@
                 QString sName = filename;
                 int nPos = sName.lastIndexOf( "/" );
-                m_sSampleName = sName.mid( nPos + 1, sName.length() );
 
-                INFOLOG( "[updateDisplay] sample: " + m_sSampleName  );
+                if ( sName.endsWith("emptySample.wav")){
+                        m_sSampleName = "";
+                }else
+                {
+                        m_sSampleName = sName.mid( nPos + 1, sName.length() );
+                }
+
+//              INFOLOG( "[updateDisplay] sample: " + m_sSampleName  );
 
                 int nSampleLenght = pNewSample->get_n_frames();
@@ -122 +128 @@
                 }
         }
-        else {
-                m_sSampleName = "-";
-                for ( int i =0; i < width(); ++i ){
-                        m_pPeakData[ i ] = 0;
-                }
-        }
 
         delete pNewSample;