hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

classify .xml-files always as presets and do not examine them more detailed - also improves LMMS-startup-times

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1117 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-09 22:39:33 +00:00
parent 8ed8db0282
commit 9fa31fcc30
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,5 +1,12 @@
2008-06-09 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/gui/main_window.cpp:
also show *.xiz files in preset-browser
* src/gui/file_browser.cpp:
classify .xml-files always as presets and do not examine them more
detailed - also improves LMMS-startup-times
* Makefile.am:
added a few files to LMMS-headers

15
src/gui/file_browser.cpp
View File

@@ -223,13 +223,12 @@ void listView::activateListItem( QTreeWidgetItem * _item, int _column )
#ifdef LMMS_DEBUG
assert( it != NULL );
#endif
instrument * afp = it->loadInstrument(
instrument * inst = it->loadInstrument(
engine::sampleExtensions()[f->extension()] );
if( afp != NULL )
if( inst != NULL )
{
afp->setParameter( "samplefile", f->fullName() );
inst->setParameter( "samplefile", f->fullName() );
}
//it->toggledInstrumentTrackButton( TRUE );
engine::getMixer()->unlock();
}
else if( f->type() == fileItem::PresetFile )
@@ -826,20 +825,20 @@ void fileItem::determineFileType( void )
}
else if( ext == "xml" )
{
multimediaProject::ProjectTypes t =
/* multimediaProject::ProjectTypes t =
multimediaProject::typeOfFile( fullName() );
if( t == multimediaProject::SongProject )
{
m_type = ProjectFile;
}
else if( t == multimediaProject::InstrumentTrackSettings )
{
{*/
m_type = PresetFile;
}
/* }
else
{
m_type = UnknownFile;
}
}*/
}
else if( ext == "csf" )
{