From 7d808d434f565e7ddc198d2a7a6f58602bac0355 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 8 Dec 2008 01:32:24 +0000 Subject: [PATCH] added ResourcesDB::Item::TypeMidiFile git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1880 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 4 ++++ include/resources_db.h | 9 ++++++--- src/core/resources_db.cpp | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1277017a5..0c81a7a33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-12-08 Tobias Doerffel + * include/resources_db.h: + * src/core/resources_db.cpp: + added ResourcesDB::Item::TypeMidiFile + * include/fluiq/collapsible_widget.h: * include/fluiq/splitter.h: * include/fluiq/widget.h: diff --git a/include/resources_db.h b/include/resources_db.h index c91263ccb..a2e8cbde5 100644 --- a/include/resources_db.h +++ b/include/resources_db.h @@ -32,9 +32,11 @@ #include #define foreachTreeItem(list) \ - for(TreeItemList::Iterator it=list.begin();it!=list.end();++it) -#define foreachConstTreeItem(list) \ - for(TreeItemList::ConstIterator it=list.begin(); \ + for(ResourcesDB::TreeItemList::Iterator it=list.begin();\ + it!=list.end();++it) + +#define foreachConstTreeItem(list) \ + for(ResourcesDB::TreeItemList::ConstIterator it=list.begin(); \ it!=list.end();++it) class ResourcesDB : public QObject @@ -66,6 +68,7 @@ public: TypeSoundFont, TypePreset, TypeProject, + TypeMidiFile, TypeForeignProject, TypePlugin, TypeImage, diff --git a/src/core/resources_db.cpp b/src/core/resources_db.cpp index 4a8dab186..a441b6c2c 100644 --- a/src/core/resources_db.cpp +++ b/src/core/resources_db.cpp @@ -127,7 +127,8 @@ ResourcesDB::Item::Types ResourcesDB::Item::guessType( void ) const typeMap["mmp"] = TypeProject; typeMap["mmpz"] = TypeProject; - typeMap["mid"] = TypeForeignProject; + typeMap["mid"] = TypeMidiFile; + typeMap["flp"] = TypeForeignProject; typeMap["dll"] = TypePlugin; @@ -193,7 +194,6 @@ void ResourcesDB::Item::init( void ) } if( m_hash.isEmpty() ) { -printf("rehash %s\n", fullName().toAscii().constData()); QCryptographicHash h( QCryptographicHash::Sha1 ); QFile f( fullName() ); @@ -477,7 +477,7 @@ void ResourcesDB::readDir( const QString & _dir, TreeItem * _parent, TreeItem * curParent = _parent->findChild( d.dirName() + QDir::separator(), _base_dir ); -printf("read dir: %s (%d)\n", d.canonicalPath().toAscii().constData(), curParent ); +printf("read dir: %s\n", d.canonicalPath().toAscii().constData() ); if( curParent ) { parentItem = curParent->item();