Changeset 517

Timestamp:

09/24/08 18:03:19 (2 months ago)

Author:

wolke

Message:

some playlist enhancements

Files:

• trunk/gui/src/PlaylistEditor/PlaylistDialog.cpp (modified) (11 diffs)
• trunk/gui/src/PlaylistEditor/PlaylistDialog.h (modified) (1 diff)
• trunk/gui/src/SoundLibrary/SoundLibraryPanel.cpp (modified) (4 diffs)

trunk/gui/src/PlaylistEditor/PlaylistDialog.cpp

@@ -171 +171 @@
-                QTreeWidget* m_pPlaylist = m_pPlaylistTree;
-                QTreeWidgetItem* m_pPlaylistItem = m_pPlaylist->topLevelItem ( aselected );
-
-
-
-
+
+
+
+
+
+
-        connect(timer, SIGNAL(timeout() ), this, SLOT( updateActiveSongNumber() ) );
-        timer->start( 1000 );   // update player control at 1 fps
@@ -213 +215 @@
-        QTreeWidget* m_pPlaylist = m_pPlaylistTree;
-        QTreeWidgetItem* m_pPlaylistItem = m_pPlaylistTree->currentItem();
+        int index = m_pPlaylist->indexOfTopLevelItem ( m_pPlaylistItem );
-        QTreeWidgetItem * m_pItem = m_pPlaylist->topLevelItem ( 1 );
-
@@ -238 +241 @@
-                        delete m_pPlaylistItem;
-                        updatePlayListVector();
+                        if (  Playlist::get_instance()->getActiveSongNumber() == index ){
+                                Playlist::get_instance()->setActiveSongNumber( -1 );
+                        }else if (  Playlist::get_instance()->getActiveSongNumber() > index  ){
+                                Playlist::get_instance()->setActiveSongNumber(  Playlist::get_instance()->getActiveSongNumber() -1 );
+                        }
+                        
-                }
-        }
@@ -332 +341 @@
-                        m_pPlaylist->setCurrentItem ( m_pPlaylistItem );
-                        Playlist::get_instance()->setSelectedSongNr( 0 );
-//                      Playlist::get_instance()->setNextSongByNumber( 0 );
-                }
-
@@ -557 +565 @@
-void PlaylistDialog::o_upBClicked()
-{       
+        timer->stop();
-
-        Playlist* pList = Playlist::get_instance();
@@ -564 +573 @@
-        int index = m_pPlaylist->indexOfTopLevelItem ( m_pPlaylistItem );
-
-
+
+
+
+
-
-        QTreeWidgetItem* tmpPlaylistItem = m_pPlaylist->takeTopLevelItem ( index );
@@ -571 +583 @@
-        m_pPlaylist->setCurrentItem ( tmpPlaylistItem ); 
-
-
+=
-                pList->setSelectedSongNr( pList->getSelectedSongNr() -1 );
-
+
+
-                pList->setActiveSongNumber( pList->getActiveSongNumber() -1 );
+        }else if ( pList->getActiveSongNumber() == index -1 ){
+                pList->setActiveSongNumber( pList->getActiveSongNumber() +1 );
+        }
-
-        updatePlayListVector();
@@ -583 +599 @@
-void PlaylistDialog::o_downBClicked()
-{
-
+
-        Playlist* pList = Playlist::get_instance();
-
@@ -591 +607 @@
-        int index = m_pPlaylist->indexOfTopLevelItem ( m_pPlaylistItem );
-
-
-
+
+
+
+
-
-
@@ -600 +618 @@
-        m_pPlaylist->setCurrentItem ( tmpPlaylistItem ); 
-
-
+=
-                pList->setSelectedSongNr( pList->getSelectedSongNr() +1 );
-
+
+
-                pList->setActiveSongNumber( pList->getActiveSongNumber() +1 );
-
+
+
+
-        updatePlayListVector();
-
@@ -762 +783 @@
-                Hydrogen::get_instance()->m_PlayList.push_back( playListItem );
-        }
+        timer->start( 1000 );
-}
-
-
-void PlaylistDialog::updateActiveSongNumber()
-
+
+
+
+
+
+
+
+
+
+
+
+
-        int selected = Playlist::get_instance()->getActiveSongNumber();
-        if ( selected == -1 ) 
-                return;
-        
-        QTreeWidget* m_pPlaylist = m_pPlaylistTree;
-        QTreeWidgetItem* m_pPlaylistItem = m_pPlaylist->topLevelItem ( selected );      
-
+
+
+
+
-}
-

trunk/gui/src/PlaylistEditor/PlaylistDialog.h

@@ -76 +76 @@
-                void setFirstItemCurrent();
-                Button *zoom_in_btn;
+                QTimer *timer;
-};
-

trunk/gui/src/SoundLibrary/SoundLibraryPanel.cpp

@@ -240 +240 @@
-                        QTreeWidgetItem* pDrumkitItem = new QTreeWidgetItem( __user_drumkits_item );
-                        pDrumkitItem->setText( 0, pInfo->getName() );
-
- 
+ 
+
-                        }
-
@@ -265 +265 @@
-                        QTreeWidgetItem* pDrumkitItem = new QTreeWidgetItem( __system_drumkits_item );
-                        pDrumkitItem->setText( 0, pInfo->getName() );
-pInfo->getName()
- 
+ pInfo->getName() 
+
-                        }
-
@@ -479 +479 @@
- 
-        for (uint i = 0; i < systemList.size() ; i++){
-) 
+ )
-                        break;
-                if ( ( __system_drumkits_item->child( i ) )->text( 0 ) == curlib ){
@@ -488 +488 @@
-
-        for (uint i = 0; i < userList.size() ; i++){
-) 
+ )
-                        break;
-                if ( ( __user_drumkits_item->child( i ))->text( 0 ) == curlib ){
-
+ 
-                        break;
-                }