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

enabled speex, fixed SDL_sound and ladspa segfault

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@438 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2006-12-11 03:18:16 +00:00
parent f9063f9383
commit c6aa917e9c
7 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/file_browser.cpp
View File

@@ -938,7 +938,8 @@ void fileItem::determineFileType( void )
}
else if( ext == "wav" || ext == "ogg" || ext == "mp3" ||
ext == "aiff" || ext == "aif" || ext == "voc" ||
ext == "au" || ext == "raw" || ext == "flac" )
ext == "au" || ext == "raw" || ext == "flac" ||
ext == "spx" )
{
m_type = SAMPLE_FILE;
}

2
src/core/main_window.cpp
View File

@@ -140,7 +140,7 @@ mainWindow::mainWindow( engine * _engine ) :
side_bar->appendTab( new fileBrowser(
configManager::inst()->factorySamplesDir() + "*" +
configManager::inst()->userSamplesDir(),
"*.wav *.ogg *.au"
"*.wav *.ogg *.spx *.au"
"*.voc *.aif *.aiff *.flac *.raw",
tr( "My samples" ),
embed::getIconPixmap( "sound_file" ),

20
src/lib/sample_buffer.cpp
View File

@@ -390,8 +390,8 @@ m_data[frame][chnl] = buf[idx] * fac;
#ifdef SDL_SDL_SOUND_H
f_cnt_t sampleBuffer::decodeSampleSDL( const char * _f,
int_sample_t * & _buf,
ch_cnt_t & _channels,
sample_rate_t & _samplerate )
ch_cnt_t _channels,
sample_rate_t _samplerate )
{
Sound_AudioInfo STD_AUDIO_INFO =
{
@@ -408,8 +408,6 @@ f_cnt_t sampleBuffer::decodeSampleSDL( const char * _f,
{
// let SDL_sound decode our file to requested format
( void )Sound_DecodeAll( snd_sample );
_channels = snd_sample->actual.channels;
_samplerate = snd_sample->actual.rate;
frames = snd_sample->buffer_size / ( BYTES_PER_INT_SAMPLE *
_channels );
_buf = new int_sample_t[frames * _channels];
@@ -1052,11 +1050,12 @@ QString sampleBuffer::openAudioFile( void ) const
// set filters
#ifdef QT4
QStringList types;
types << tr( "All Audio-Files (*.wav *.ogg *.flac *.voc *.aif *.aiff "
"*.au *.raw)" )
types << tr( "All Audio-Files (*.wav *.ogg *.flac *.spx *.voc *.aif "
"*.aiff *.au *.raw)" )
<< tr( "Wave-Files (*.wav)" )
<< tr( "OGG-Files (*.ogg)" )
<< tr( "FLAC-Files (*.flac)" )
<< tr( "SPEEX-Files (*.spx)" )
//<< tr( "MP3-Files (*.mp3)" )
//<< tr( "MIDI-Files (*.mid)" )
<< tr( "VOC-Files (*.voc)" )
@@ -1067,11 +1066,12 @@ QString sampleBuffer::openAudioFile( void ) const
;
ofd.setFilters( types );
#else
ofd.addFilter( tr( "All Audio-Files (*.wav *.ogg *.flac *.voc *.aif "
"*.aiff *.au *.raw)" ) );
ofd.addFilter( tr( "All Audio-Files (*.wav *.ogg *.flac *.spx *.voc "
"*.aif *.aiff *.au *.raw)" ) );
ofd.addFilter( tr( "Wave-Files (*.wav)" ) );
ofd.addFilter( tr( "OGG-Files (*.ogg)" ) );
ofd.addFilter( tr( "FLAC-Files (*.flac)" ) );
ofd.addFilter( tr( "SPEEX-Files (*.spx)" ) );
//ofd.addFilter (tr("MP3-Files (*.mp3)"));
//ofd.addFilter (tr("MIDI-Files (*.mid)"));^
ofd.addFilter( tr( "VOC-Files (*.voc)" ) );
@@ -1079,8 +1079,8 @@ QString sampleBuffer::openAudioFile( void ) const
ofd.addFilter( tr( "AU-Files (*.au)" ) );
ofd.addFilter( tr( "RAW-Files (*.raw)" ) );
//ofd.addFilter (tr("MOD-Files (*.mod)"));
ofd.setSelectedFilter( tr( "All Audio-Files (*.wav *.ogg *.flac *.voc "
"*.aif *.aiff *.au *.raw)" ) );
ofd.setSelectedFilter( tr( "All Audio-Files (*.wav *.ogg *.flac *.spx "
"*.voc *.aif *.aiff *.au *.raw)" ) );
#endif
if( m_audioFile != "" )
{