Changeset 512

Timestamp:

09/24/08 07:43:23 (5 years ago)

Author:

wolke

Message:

merge changes on trunk into audiofilebrowser branche

Location:

branches/audiofilebrowser

Files:

• data/new_manual/img/PatternEditor.png (modified) (previous)
• data/new_manual/img/PreferencesAudioSystem.png (modified) (previous)
• data/new_manual/img/PreferencesGeneral.png (copied) (copied from trunk/data/new_manual/img/PreferencesGeneral.png)
• data/new_manual/img/SongEditorContextMenue.png (copied) (copied from trunk/data/new_manual/img/SongEditorContextMenue.png)
• data/new_manual/index.html (modified) (1 diff)
• gui/src/HydrogenApp.cpp (modified) (1 diff)
• gui/src/PatternEditor/PatternEditorPanel.cpp (modified) (1 diff)
• gui/src/SoundLibrary/SoundLibraryRepositoryDialog.cpp (modified) (1 diff)
• gui/src/widgets/midiTable.cpp (modified) (1 diff)
• libs/hydrogen/src/instrument.cpp (modified) (1 diff)

branches/audiofilebrowser/data/new_manual/index.html

@@ -356 +356 @@
                 <area shape="rect" coords="433,4,471,21" title="Record an instrument from an external source"  nohref="nohref" />
                 <area shape="rect" coords="472,3,530,21" title="Quantize instrument: notes added will respect the grid resolution"  nohref="nohref" />
-                <area shape="rect" coords="531,2,603,22" title="Zoom in/out the pattern view"  nohref="nohref" />
                 <area shape="rect" coords="1,24,181,49" title="Current selected pattern name"  nohref="nohref" />
-                <area shape="rect" coords="0,49,150,505" title="Instrument name column"  nohref="nohref" />
-                <area shape="rect" coords="151,50,164,505" title="Red square: mute instrument"  nohref="nohref" />
-                <area shape="rect" coords="165,51,177,505" title="Green square: play solo"  nohref="nohref" />
-                <area shape="rect" coords="182,26,777,506" title="Pattern overview"  nohref="nohref" />
-                <area shape="rect" coords="1,549,178,561" title="Drop down menu to tune velocity, pan, lead&amp;lag" nohref="nohref" />
-                <area shape="rect" coords="181,505,778,602" title="Vertical bars representing velocity, pan, lead&amp;lag" nohref="nohref" />
+                <area shape="rect" coords="0,49,150,387" title="Instrument name column"  nohref="nohref" />
+                <area shape="rect" coords="151,50,164,387" title="Red square: mute instrument"  nohref="nohref" />
+                <area shape="rect" coords="165,51,177,387" title="Green square: play solo"  nohref="nohref" />
+                <area shape="rect" coords="182,26,777,387" title="Pattern overview"  nohref="nohref" />
+                <area shape="rect" coords="1,455,178,471" title="Drop down menu to tune velocity, pan, lead&amp;lag" nohref="nohref" />
+                <area shape="rect" coords="181,412,789,513" title="Vertical bars representing velocity, pan, lead&amp;lag" nohref="nohref" />
+                <area shape="rect" coords="760,513,797,528" title="Zoom in/out the pattern view"  nohref="nohref" />
         </map>
 </div>

branches/audiofilebrowser/gui/src/HydrogenApp.cpp

@@ -121 +121 @@
         Hydrogen *engine = Hydrogen::get_instance();
         if (engine) {
-                delete engine->getSong();
+                H2Core::Song * song = engine->getSong();
+                // Hydrogen calls removeSong on from its destructor, so here we just delete the objects:
                 delete engine;
+                delete song;
         }
 

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

@@ -213 +213 @@
 
 
-        // show drum editor btn
-        __show_drum_btn = new ToggleButton(
-                        NULL,
-                        "/skin_btn_on.png",
-                        "/skin_btn_off.png",
-                        "/skin_btn_over.png",
-                        QSize(40, 17),
-                        true
-        );
-        __show_drum_btn->setText( trUtf8("Drum") );
-        __show_drum_btn->setPressed( true );
-        __show_drum_btn->setToolTip( trUtf8( "Show drum editor" ) );
-        connect(__show_drum_btn, SIGNAL(clicked(Button*)), this, SLOT( showDrumEditorBtnClick(Button*)));
-        editor_top_hbox->addWidget(__show_drum_btn);
-        __show_drum_btn->hide();
-
-
-        // show piano roll btn
-        __show_piano_btn = new ToggleButton(
-                        NULL,
-                        "/skin_btn_on.png",
-                        "/skin_btn_off.png",
-                        "/skin_btn_over.png",
-                        QSize(40, 17),
-                        true
-        );
-        __show_piano_btn->setText( trUtf8("Piano") );
-        __show_piano_btn->setPressed( false );
-        __show_piano_btn->setToolTip( trUtf8( "Show piano roll editor" ) );
-        connect(__show_piano_btn, SIGNAL(clicked(Button*)), this, SLOT( showPianoEditorBtnClick(Button*)));
-        editor_top_hbox->addWidget(__show_piano_btn);
-        __show_piano_btn->hide();
 // End Editor TOP
 

branches/audiofilebrowser/gui/src/SoundLibrary/SoundLibraryRepositoryDialog.cpp

@@ -75 +75 @@
         QString text = QInputDialog::getText(this, trUtf8("Edit server list"), trUtf8("URL"), QLineEdit::Normal,QString(""), &ok);
         
-        if( ok and !text.isEmpty() ){
+        if( ok && !text.isEmpty() ){
                 pPref->sServerList.push_back( text );
         }

branches/audiofilebrowser/gui/src/widgets/midiTable.cpp

@@ -56 +56 @@
                 QComboBox * actionCombo = dynamic_cast <QComboBox *> ( cellWidget( __row_count - 1, 2 ) );
 
-                if( eventCombo == NULL or actionCombo == NULL) return;
+                if( eventCombo == NULL || actionCombo == NULL) return;
 
-                if( actionCombo->currentText() != "" and eventCombo->currentText() != "" ) {
+                if( actionCombo->currentText() != "" && eventCombo->currentText() != "" ) {
                         insertNewRow("", "", 0, 0);
                 }

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

@@ -141 +141 @@
                         pLayer->set_end_velocity( pNewLayer->get_end_velocity() );
                         pLayer->set_gain( pNewLayer->get_gain() );
+                         pLayer->set_pitch(pNewLayer->get_pitch()); 
 
                         if ( is_live )