Skip to content

Enable sf3 extension #3895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tresf merged 4 commits into from
Nov 15, 2017
Merged

Enable sf3 extension #3895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10b66dc
Add sf3 file extension
tresf Oct 19, 2017
55774da
Add sf3 to DataFile
tresf Oct 19, 2017
e3966b0
Add sf3 to supportedFileTypes Descriptor
tresf Oct 19, 2017
8e2315a
Use "soundfonts" folder, not "sf2"
tresf Nov 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/ConfigManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const QString TEMPLATE_PATH = "templates/";
const QString PRESETS_PATH = "presets/";
const QString SAMPLES_PATH = "samples/";
const QString GIG_PATH = "samples/gig/";
const QString SF2_PATH = "samples/sf2/";
const QString SF2_PATH = "samples/soundfonts/";
const QString LADSPA_PATH ="plugins/ladspa/";
const QString DEFAULT_THEME_PATH = "themes/default/";
const QString TRACK_ICON_PATH = "track_icons/";
Expand Down
4 changes: 2 additions & 2 deletions plugins/sf2_player/sf2_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Plugin::Descriptor PLUGIN_EXPORT sf2player_plugin_descriptor =
0x0100,
Plugin::Instrument,
new PluginPixmapLoader( "logo" ),
"sf2",
"sf2,sf3",
NULL
} ;

Expand Down Expand Up @@ -1078,7 +1078,7 @@ void sf2InstrumentView::showFileDialog()
ofd.setFileMode( FileDialog::ExistingFiles );

QStringList types;
types << tr( "SoundFont2 Files (*.sf2)" );
types << tr( "SoundFont Files (*.sf2 *.sf3)" );
ofd.setNameFilters( types );

if( k->m_filename != "" )
Expand Down
2 changes: 1 addition & 1 deletion src/core/DataFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ bool DataFile::validate( QString extension )
if (! ( extension == "mmp" || extension == "mpt" || extension == "mmpz" ||
extension == "xpf" || extension == "xml" ||
( extension == "xiz" && ! pluginFactory->pluginSupportingExtension(extension).isNull()) ||
extension == "sf2" || extension == "pat" || extension == "mid" ||
extension == "sf2" || extension == "sf3" || extension == "pat" || extension == "mid" ||
extension == "dll"
) )
{
Expand Down
4 changes: 2 additions & 2 deletions src/gui/FileBrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ void FileBrowserTreeWidget::mousePressEvent(QMouseEvent * me )
m_previewPlayHandle = s;
delete tf;
}
else if( ( f->extension ()== "xiz" || f->extension() == "sf2" || f->extension() == "gig" ) &&
else if( ( f->extension ()== "xiz" || f->extension() == "sf2" || f->extension() == "sf3" || f->extension() == "gig" ) &&
! pluginFactory->pluginSupportingExtension(f->extension()).isNull() )
{
m_previewPlayHandle = new PresetPreviewPlayHandle( f->fullName(), f->handling() == FileItem::LoadByPlugin );
Expand Down Expand Up @@ -983,7 +983,7 @@ void FileItem::determineFileType( void )
m_type = PresetFile;
m_handling = LoadByPlugin;
}
else if( ext == "sf2" )
else if( ext == "sf2" || ext == "sf3" )
{
m_type = SoundFontFile;
}
Expand Down