Changeset 475

Show
Ignore:
Timestamp:
09/15/08 00:21:49 (5 years ago)
Author:
wolke
Message:

add audiofilebrowser files

Location:
branches/audiofilebrowser/gui/src
Files:
2 added
3 modified

Legend:

Unmodified
Added
Removed

  • branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser_UI.ui

    r474 r475  
    11<ui version="4.0" > 
    2  <class>audiofilebrowser</class> 
     2<class>AudioFileBrowser_UI</class> 
    33 <widget class="QDialog" name="audiofilebrowser" > 
    44  <property name="geometry" > 

  • branches/audiofilebrowser/gui/src/HydrogenApp.cpp

    r471 r475  
    3838#include "SongEditor/SongEditorPanel.h" 
    3939#include "PlaylistEditor/PlaylistDialog.h" 
     40#include "AudioFileBrowser/AudioFileBrowser.h" 
    4041 
    4142#include "Mixer/Mixer.h" 
    … …  
    6566 , m_pPlayerControl( NULL ) 
    6667 , m_pPlaylistDialog( NULL ) 
     68 , m_pAudioFileBrowser( NULL ) 
     69 
    6770{ 
    6871        m_pInstance = this; 
    … …  
    98101         
    99102         m_pPlaylistDialog = new PlaylistDialog( 0 ); 
     103         m_pAudioFileBrowser = new AudioFileBrowser( 0 ); 
    100104         
    101105        showInfoSplash();       // First time information 
    … …  
    113117        delete m_pMixer; 
    114118        delete m_pPlaylistDialog; 
     119        delete m_pAudioFileBrowser; 
    115120 
    116121        Hydrogen *engine = Hydrogen::get_instance(); 
    … …  
    307312} 
    308313 
     314void HydrogenApp::showAudioFileBrowser() 
     315{ 
     316        m_pAudioFileBrowser->hide(); 
     317        m_pAudioFileBrowser->show(); 
     318} 
    309319 
    310320void HydrogenApp::showInfoSplash() 

  • branches/audiofilebrowser/gui/src/HydrogenApp.h

    r471 r475  
    5454class InstrumentRack; 
    5555class PlaylistDialog; 
     56class AudioFileBrowser; 
    5657 
    5758class HydrogenApp : public QObject, public Object 
    … …  
    7273                void showAudioEngineInfoForm(); 
    7374                void showPlaylistDialog(); 
     75                void showAudioFileBrowser(); 
    7476 
    7577                Mixer* getMixer() {     return m_pMixer;        } 
    … …  
    7880                AudioEngineInfoForm* getAudioEngineInfoForm() { return m_pAudioEngineInfoForm;  } 
    7981                PlaylistDialog* getPlayListDialog() {   return m_pPlaylistDialog;       } 
     82                AudioFileBrowser* getAudioFileBrowser() {  return m_pAudioFileBrowser;  } 
    8083                SimpleHTMLBrowser* getHelpBrowser() {   return m_pHelpBrowser;  } 
    8184                PatternEditorPanel* getPatternEditorPanel() {   return m_pPatternEditorPanel;   } 
    … …  
    114117                PlayerControl *m_pPlayerControl; 
    115118                PlaylistDialog *m_pPlaylistDialog; 
     119                AudioFileBrowser *m_pAudioFileBrowser; 
    116120 
    117121                QTimer *m_pEventQueueTimer;