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

made all sound-generator-plugins shared libraries which are loaded at runtime when needed; removed obsolete files and fixed bugs in tabWidget

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@13 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2005-09-30 10:31:55 +00:00
parent b3754454cd
commit 6ba478ff6b
10 changed files with 89 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/song_editor.cpp
View File

@@ -26,6 +26,8 @@
#include <config.h>
#endif
#include <math.h>
#include "qt3support.h"
@@ -88,8 +90,6 @@
#include "debug.h"
#include "triple_oscillator.h"
extern QString file_to_load;
extern QString file_to_render;
@@ -1295,7 +1295,7 @@ void songEditor::addChannelTrack( void )
#ifdef LMMS_DEBUG
assert( t != NULL );
#endif
t->loadPluginSettings( tripleOscillator::defaultSettings() );
t->loadPlugin( "tripleoscillator" );
t->toggledChannelButton( TRUE );
t->show();
}
@@ -1427,12 +1427,12 @@ void songEditor::createNewProject( void )
track * t;
t = track::createTrack( track::CHANNEL_TRACK, this );
dynamic_cast< channelTrack * >( t )->loadPluginSettings(
tripleOscillator::defaultSettings() );
dynamic_cast< channelTrack * >( t )->loadPlugin(
"tripleoscillator" );
track::createTrack( track::SAMPLE_TRACK, this );
t = track::createTrack( track::CHANNEL_TRACK, bbEditor::inst() );
dynamic_cast< channelTrack * >( t )->loadPluginSettings(
tripleOscillator::defaultSettings() );
dynamic_cast< channelTrack * >( t )->loadPlugin(
"tripleoscillator" );
track::createTrack( track::BB_TRACK, this );
setBPM( DEFAULT_BPM );

6
src/lib/oscillator.cpp
View File

@@ -25,8 +25,6 @@
#include "oscillator.h"
const sampleFrame zero_frame = { 0.0f, 0.0f };
oscillator::oscillator( modulationAlgos _modulation_algo, float _freq,
Sint16 _phase_offset, float _volume_factor,
@@ -35,7 +33,7 @@ oscillator::oscillator( modulationAlgos _modulation_algo, float _freq,
m_volumeFactor(_volume_factor),
m_phaseOffset(_phase_offset),
m_subOsc(_sub_osc),
m_userWaveData( &zero_frame ),
m_userWaveData( &ZERO_FRAME ),
m_userWaveFrames( 1 )
{
@@ -189,7 +187,7 @@ generateOscillatorCodeFor( userWaveOsc, userWaveSample );
oscillator * FASTCALL oscillator::createNewOsc( waveShapes _wave_shape,
oscillator * oscillator::createOsc( waveShapes _wave_shape,
modulationAlgos _modulation_algo,
float _freq, Sint16 _phase_offset,
float _volume_factor,

3
src/widgets/tab_widget.cpp
View File

@@ -76,7 +76,7 @@ tabWidget::~tabWidget()
void tabWidget::addTab( QWidget * _w, const QString & _name, int _idx )
{
widgetDesc d = { _w, _name, fontMetrics().width( _name ) + 10 } ;
if( _idx < 0 || m_widgets.contains( _idx ) == TRUE )
if( _idx < 0/* || m_widgets.contains( _idx ) == TRUE*/ )
{
while( m_widgets.contains( ++_idx ) == TRUE )
{
@@ -85,6 +85,7 @@ void tabWidget::addTab( QWidget * _w, const QString & _name, int _idx )
m_widgets[_idx] = d;
_w->setFixedSize( width() - 4, height() - 14 );
_w->move( 2, 12 );
_w->show();
if( m_widgets.contains( m_activeTab ) )
{