diff --git a/ChangeLog b/ChangeLog index 1e3694901..c28493ff4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,30 @@ 2008-03-08 Tobias Doerffel + * include/effect_board.h: + removed + + * include/fx_mixer.h: + * src/tracks/instrument_track.cpp: + added definition for upcoming FX-mixer + + * plugins/triple_oscillator/triple_oscillator.h: + * include/meter_dialog.h: + * include/instrument_functions.h: + * include/instrument_sound_shaping.h: + * include/instrument_function_views.h: + * include/bb_track.h: + * include/ladspa_control_view.h: + * include/instrument_sound_shaping_view.h: + * src/midi/midi_client.cpp: + * src/widgets/ladspa_control_view.cpp: + * src/widgets/instrument_sound_shaping_view.cpp: + * src/widgets/instrument_function_views.cpp: + * src/core/instrument_sound_shaping.cpp: + * src/core/instrument_functions.cpp: + * Makefile.am: + added missing Q_OBJECT-macros for views which made localizations not + work + * plugins/sf2_player/logo.png: replaced Kicker-logo with actual logo diff --git a/Makefile.am b/Makefile.am index fb79103fe..59d3b1335 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) $(LUPDATE) $(lmms_SOURCES) `find plugins/ -type f -name "*.cpp"` -ts data/locale/$@ %.qm: %.ts - $(LRELEASE) $< + $(LRELEASE) data/locale/$< man1_MANS = lmms.1 @@ -69,11 +69,16 @@ lmms_MOC = \ ./file_browser.moc \ ./graph.moc \ ./group_box.moc \ + ./instrument_functions.moc \ + ./instrument_function_views.moc \ ./instrument_midi_io.moc \ ./instrument_midi_io_view.moc \ + ./instrument_sound_shaping.moc \ + ./instrument_sound_shaping_view.moc \ ./kmultitabbar.moc \ ./knob.moc \ ./ladspa_control.moc \ + ./ladspa_control_view.moc \ ./lcd_spinbox.moc \ ./led_checkbox.moc \ ./main_window.moc \ @@ -287,7 +292,7 @@ lmms_SOURCES = \ $(srcdir)/include/instrument_view.h \ $(srcdir)/include/bb_editor.h \ $(srcdir)/include/piano.h \ - $(srcdir)/include/effect_board.h \ + $(srcdir)/include/fx_mixer.h \ $(srcdir)/include/pixmap_button.h \ $(srcdir)/include/rename_dialog.h \ $(srcdir)/include/export_project_dialog.h \ diff --git a/include/bb_track.h b/include/bb_track.h index 028604672..109f10d5a 100644 --- a/include/bb_track.h +++ b/include/bb_track.h @@ -105,6 +105,7 @@ private: class bbTrack : public track { + Q_OBJECT public: bbTrack( trackContainer * _tc ); virtual ~bbTrack(); diff --git a/include/instrument_function_views.h b/include/instrument_function_views.h index 0b3f200ff..3fccd24b6 100644 --- a/include/instrument_function_views.h +++ b/include/instrument_function_views.h @@ -42,6 +42,7 @@ class chordCreator; class chordCreatorView : public QWidget, public modelView { + Q_OBJECT public: chordCreatorView( chordCreator * _cc, QWidget * _parent ); virtual ~chordCreatorView(); @@ -64,6 +65,7 @@ private: class arpeggiatorView : public QWidget, public modelView { + Q_OBJECT public: arpeggiatorView( arpeggiator * _arp, QWidget * _parent ); virtual ~arpeggiatorView(); diff --git a/include/instrument_functions.h b/include/instrument_functions.h index edd753a08..c98510940 100644 --- a/include/instrument_functions.h +++ b/include/instrument_functions.h @@ -42,6 +42,7 @@ const int MAX_CHORD_POLYPHONY = 10; class chordCreator : public model, public journallingObject { + Q_OBJECT public: chordCreator( instrumentTrack * _instrument_track ); virtual ~chordCreator(); @@ -91,6 +92,7 @@ private: class arpeggiator : public model, public journallingObject { + Q_OBJECT public: enum ArpDirections { diff --git a/include/instrument_sound_shaping.h b/include/instrument_sound_shaping.h index e15ddac4d..2740cc691 100644 --- a/include/instrument_sound_shaping.h +++ b/include/instrument_sound_shaping.h @@ -38,6 +38,7 @@ class notePlayHandle; class instrumentSoundShaping : public model, public journallingObject { + Q_OBJECT public: instrumentSoundShaping( instrumentTrack * _instrument_track ); virtual ~instrumentSoundShaping(); diff --git a/include/instrument_sound_shaping_view.h b/include/instrument_sound_shaping_view.h index 1a35af912..0e6551c01 100644 --- a/include/instrument_sound_shaping_view.h +++ b/include/instrument_sound_shaping_view.h @@ -39,6 +39,7 @@ class tabWidget; class instrumentSoundShapingView : public QWidget, public modelView { + Q_OBJECT public: instrumentSoundShapingView( QWidget * _parent ); virtual ~instrumentSoundShapingView(); diff --git a/include/ladspa_control_view.h b/include/ladspa_control_view.h index 2a795130d..302a6c812 100644 --- a/include/ladspa_control_view.h +++ b/include/ladspa_control_view.h @@ -35,6 +35,7 @@ class ladspaControl; class ladspaControlView : public QWidget, public modelView { + Q_OBJECT public: ladspaControlView( QWidget * _parent, ladspaControl * _ctl ); virtual ~ladspaControlView(); diff --git a/include/meter_dialog.h b/include/meter_dialog.h index 013ce5e7c..2d5d13b3d 100644 --- a/include/meter_dialog.h +++ b/include/meter_dialog.h @@ -70,9 +70,10 @@ signals: class meterDialog : public QWidget, public modelView { + Q_OBJECT public: meterDialog( QWidget * _parent ); - ~meterDialog(); + virtual ~meterDialog(); virtual void modelChanged( void ); diff --git a/plugins/triple_oscillator/triple_oscillator.h b/plugins/triple_oscillator/triple_oscillator.h index 9ee038a90..a00a1523c 100644 --- a/plugins/triple_oscillator/triple_oscillator.h +++ b/plugins/triple_oscillator/triple_oscillator.h @@ -144,6 +144,7 @@ private: class tripleOscillatorView : public instrumentView { + Q_OBJECT public: tripleOscillatorView( instrument * _instrument, QWidget * _parent ); virtual ~tripleOscillatorView(); diff --git a/src/core/instrument_functions.cpp b/src/core/instrument_functions.cpp index f0eaae2e4..66d7ec55e 100644 --- a/src/core/instrument_functions.cpp +++ b/src/core/instrument_functions.cpp @@ -299,7 +299,8 @@ arpeggiator::arpeggiator( instrumentTrack * _instrument_track ) : m_arpModel.setTrack( _instrument_track ); for( int i = 0; chordCreator::s_chordTable[i].interval[0] != -1; ++i ) { - m_arpModel.addItem( tr( chordCreator::s_chordTable[i]. + m_arpModel.addItem( chordCreator::tr( + chordCreator::s_chordTable[i]. name.toAscii().constData() ) ); } @@ -537,4 +538,6 @@ void arpeggiator::loadSettings( const QDomElement & _this ) } +#include "instrument_functions.moc" + #endif diff --git a/src/core/instrument_sound_shaping.cpp b/src/core/instrument_sound_shaping.cpp index 7c05af334..0c32a3766 100644 --- a/src/core/instrument_sound_shaping.cpp +++ b/src/core/instrument_sound_shaping.cpp @@ -399,73 +399,6 @@ void instrumentSoundShaping::loadSettings( const QDomElement & _this ) -//#include "instrument_sound_shaping.moc" - -/* - - -const long double coeff[5][11]= { -{ - ///A -8.11044e-06, -8.943665402, -36.83889529, 92.01697887, -154.337906, 181.6233289, --151.8651235, 89.09614114, -35.10298511, 8.388101016, -0.923313471 -}, -{ -///E -4.36215e-06, -8.90438318, -36.55179099, 91.05750846, -152.422234, 179.1170248, --149.6496211,87.78352223, -34.60687431, 8.282228154, -0.914150747 -}, -{ -///I -3.33819e-06, -8.893102966, -36.49532826, 90.96543286, -152.4545478, 179.4835618, --150.315433, 88.43409371, -34.98612086, 8.407803364, -0.932568035 -}, -{ - ///O -1.13572e-06, -8.994734087, -37.2084849, 93.22900521, -156.6929844, 184.596544, --154.3755513, 90.49663749, -35.58964535, 8.478996281, -0.929252233 -}, -{ -///U -4.09431e-07, -8.997322763, -37.20218544, 93.11385476, -156.2530937, 183.7080141, --153.2631681, 89.59539726, -35.12454591, 8.338655623, -0.910251753 -} -}; -//----------------------------------------------------------------------------- -static long double memory[10]={0,0,0,0,0,0,0,0,0,0}; -//------------------------------------------------------------------------------ -inline float formant_filter(float in, int vowelnum) -{ - float res= (float) ( coeff[vowelnum][0] *in + - coeff[vowelnum][1] *memory[0] + - coeff[vowelnum][2] *memory[1] + - coeff[vowelnum][3] *memory[2] + - coeff[vowelnum][4] *memory[3] + - coeff[vowelnum][5] *memory[4] + - coeff[vowelnum][6] *memory[5] + - coeff[vowelnum][7] *memory[6] + - coeff[vowelnum][8] *memory[7] + - coeff[vowelnum][9] *memory[8] + - coeff[vowelnum][10] *memory[9] ); - -memory[9]= memory[8]; -memory[8]= memory[7]; -memory[7]= memory[6]; -memory[6]= memory[5]; -memory[5]= memory[4]; -memory[4]= memory[3]; -memory[3]= memory[2]; -memory[2]= memory[1]; -memory[1]= memory[0]; -memory[0]=(long double) res; -return res; -} - -*/ +#include "instrument_sound_shaping.moc" #endif diff --git a/src/midi/midi_client.cpp b/src/midi/midi_client.cpp index f0f426134..fd1dde79d 100644 --- a/src/midi/midi_client.cpp +++ b/src/midi/midi_client.cpp @@ -3,7 +3,7 @@ /* * midi_client.cpp - base-class for MIDI-clients like ALSA-sequencer-client * - * Copyright (c) 2005-2007 Tobias Doerffel + * Copyright (c) 2005-2008 Tobias Doerffel * This file partly contains code from Fluidsynth, Peter Hanappe * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net @@ -371,5 +371,4 @@ Uint8 midiClientRaw::eventLength( const Uint8 _event ) } - #endif diff --git a/src/widgets/instrument_function_views.cpp b/src/widgets/instrument_function_views.cpp index d4e758d3c..a22f6aadf 100644 --- a/src/widgets/instrument_function_views.cpp +++ b/src/widgets/instrument_function_views.cpp @@ -253,5 +253,6 @@ void arpeggiatorView::modelChanged( void ) +#include "instrument_function_views.moc" #endif diff --git a/src/widgets/instrument_sound_shaping_view.cpp b/src/widgets/instrument_sound_shaping_view.cpp index f0b97c0cf..d46c2efd6 100644 --- a/src/widgets/instrument_sound_shaping_view.cpp +++ b/src/widgets/instrument_sound_shaping_view.cpp @@ -148,3 +148,6 @@ void instrumentSoundShapingView::modelChanged( void ) } + +#include "instrument_sound_shaping_view.moc" + diff --git a/src/widgets/ladspa_control_view.cpp b/src/widgets/ladspa_control_view.cpp index 9fc2618ac..51d1ca184 100644 --- a/src/widgets/ladspa_control_view.cpp +++ b/src/widgets/ladspa_control_view.cpp @@ -128,4 +128,5 @@ ladspaControlView::~ladspaControlView() +#include "ladspa_control_view.moc"