Changeset 552

Show
Ignore:
Timestamp:
10/09/08 07:09:28 (2 months ago)
Author:
wolke
Message:

merge changes on trunk into audiofilebrowser branche

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/audiofilebrowser/gui/src/PatternEditor/PatternEditorPanel.cpp

    r541 r552  
    269269 
    270270 
    271  
     271/* 
    272272        m_pPianoRollScrollView = new QScrollArea( NULL ); 
    273273        m_pPianoRollScrollView->setFrameShape( QFrame::NoFrame ); 
    …… 
    282282 
    283283        m_pPianoRollScrollView->hide(); 
     284*/ 
    284285//~ EDITOR 
    285286 
    …… 
    414415 
    415416        pGrid->addWidget( m_pEditorScrollView, 2, 1 ); 
    416       pGrid->addWidget( m_pPianoRollScrollView, 2, 1 ); 
     417//    pGrid->addWidget( m_pPianoRollScrollView, 2, 1 ); 
    417418 
    418419        pGrid->addWidget( m_pPatternEditorVScrollBar, 2, 2 ); 
    …… 
    533534 
    534535        // piano roll Editor 
    535       m_pPianoRollScrollView->horizontalScrollBar()->setValue( m_pPatternEditorHScrollBar->value() ); 
    536       m_pPianoRollScrollView->verticalScrollBar()->setValue( m_pPatternEditorVScrollBar->value() ); 
     536//    m_pPianoRollScrollView->horizontalScrollBar()->setValue( m_pPatternEditorHScrollBar->value() ); 
     537//    m_pPianoRollScrollView->verticalScrollBar()->setValue( m_pPatternEditorVScrollBar->value() ); 
    537538 
    538539 
    …… 
    689690{ 
    690691        UNUSED( ev ); 
    691         QScrollArea *pScrollArea = NULL; 
    692  
     692        QScrollArea *pScrollArea = m_pEditorScrollView; 
     693 
     694/* 
    693695        if ( m_pPianoRollScrollView->isVisible() ) { 
    694696                pScrollArea = m_pPianoRollScrollView; 
    …… 
    697699                pScrollArea = m_pEditorScrollView; 
    698700        } 
    699  
     701*/ 
    700702 
    701703        m_pPatternEditorHScrollBar->setMinimum( pScrollArea->horizontalScrollBar()->minimum() ); 
    …… 
    748750 
    749751 
    750       m_pPianoRollScrollView->hide(); 
     752//    m_pPianoRollScrollView->hide(); 
    751753        m_pEditorScrollView->show(); 
    752754        m_pInstrListScrollView->show(); 
    …… 
    767769 
    768770 
    769       m_pPianoRollScrollView->show(); 
     771//    m_pPianoRollScrollView->show(); 
    770772        m_pEditorScrollView->hide(); 
    771773        m_pInstrListScrollView->hide(); 
    772774 
    773       m_pPianoRollEditor->selectedInstrumentChangedEvent(); // force an update 
     775//    m_pPianoRollEditor->selectedInstrumentChangedEvent(); // force an update 
    774776 
    775777        // force a re-sync of extern scrollbars 

  • branches/audiofilebrowser/gui/src/PatternEditor/PatternEditorPanel.h

    r541 r552  
    4040class LCDCombo; 
    4141class DrumPatternEditor; 
    42 class PianoRollEditor; 
     42//class PianoRollEditor; 
    4343 
    4444 
    …… 
    116116 
    117117                // piano roll editor 
    118               QScrollArea* m_pPianoRollScrollView; 
    119               PianoRollEditor *m_pPianoRollEditor; 
     118//            QScrollArea* m_pPianoRollScrollView; 
     119//            PianoRollEditor *m_pPianoRollEditor; 
    120120 
    121121                // ruler 

  • branches/audiofilebrowser/gui/src/PatternEditor/PianoRollEditor.cpp

    r377 r552  
    2121 */ 
    2222 
     23/* 
    2324#include "PianoRollEditor.h" 
    2425 
    …… 
    221222} 
    222223 
     224*/ 

  • branches/audiofilebrowser/gui/src/PatternEditor/PianoRollEditor.h

    r377 r552  
    2020 * 
    2121 */ 
    22  
     22/* 
    2323#ifndef PIANO_ROLL_EDITOR_H 
    2424#define PIANO_ROLL_EDITOR_H 
    …… 
    7070 
    7171#endif 
     72*/ 

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

    r411 r552  
    324324        // save the midi file 
    325325        m_file = fopen( sFilename.toAscii(), "wb" ); 
     326         
     327        if( m_file == NULL )  
     328                return; 
     329         
    326330        vector<char> smfVect = smf.getBuffer(); 
    327331        for ( unsigned i = 0; i < smfVect.size(); i++ ) {