Changeset 561

Show
Ignore:
Timestamp:
10/14/08 17:39:36 (2 months ago)
Author:
wolke
Message:

merge changes on trunk into audiofilebrowser branche. rev. 553:560

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/audiofilebrowser/libs/hydrogen/include/hydrogen/sequencer/Sequencer.h

    r73 r561  
    2020 * 
    2121 */ 
     22/* 
    2223#ifndef SEQUENCER_H 
    2324#define SEQUENCER_H 
    …… 
    5859 
    5960#endif 
     61*/ 

  • branches/audiofilebrowser/libs/hydrogen/src/audio_engine.cpp

    r127 r561  
    6161#endif 
    6262 
    63       Sequencer::getInstance(); 
     63//    Sequencer::getInstance(); 
    6464} 
    6565 
    …… 
    7373#endif 
    7474 
    75       delete Sequencer::getInstance(); 
     75//    delete Sequencer::getInstance(); 
    7676        delete __sampler; 
    7777        delete __synth; 

  • branches/audiofilebrowser/libs/hydrogen/src/hydrogen.cpp

    r506 r561  
    294294void audioEngine_destroy() 
    295295{ 
    296         AudioEngine::get_instance()->lock( "audioEngine_destroy" ); 
    297         _INFOLOG( "*** Hydrogen audio engine shutdown ***" ); 
    298  
    299296        // check current state 
    300297        if ( m_audioEngineState != STATE_INITIALIZED ) { 
    …… 
    303300        } 
    304301        AudioEngine::get_instance()->get_sampler()->stop_playing_notes(); 
     302 
     303        AudioEngine::get_instance()->lock( "audioEngine_destroy" ); 
     304        _INFOLOG( "*** Hydrogen audio engine shutdown ***" ); 
    305305 
    306306        // delete all copied notes in the song notes queue 

  • branches/audiofilebrowser/libs/hydrogen/src/sequencer/sequencer.cpp

    r73 r561  
    2020 * 
    2121 */ 
    22  
     22/* 
    2323#include <hydrogen/sequencer/Sequencer.h> 
    2424 
    …… 
    7070 
    7171} 
     72*/ 

  • branches/audiofilebrowser/libs/hydrogen/src/song.cpp

    r436 r561  
    120120        writer.writeSong( this, filename ); 
    121121 
    122         return !QDir( filename ).exists(); 
     122        return QFile::exists( filename ); 
    123123} 
    124124 
    …… 
    193193 
    194194 
    195         TiXmlDocument doc( filename.toAscii() ); 
     195        #ifdef win32 
     196                TiXmlDocument doc( filename.toAscii().constData() ); 
     197        #else 
     198                TiXmlDocument doc( filename.toUtf8().constData() ); 
     199        #endif 
     200 
     201 
    196202        doc.LoadFile(); 
    197203