From 792d1eca17a5b3f06d02c6594fbeadf4cc410c6d Mon Sep 17 00:00:00 2001 From: Danny McRae Date: Fri, 1 Feb 2008 18:55:50 +0000 Subject: [PATCH] Updated references to renamed header files. git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@688 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 12 ++++++++++++ Makefile.am | 18 +++++++++--------- src/core/envelope_and_lfo_parameters.cpp | 4 ++-- src/core/instrument_midi_io.cpp | 4 ++-- src/core/instrument_sound_shaping.cpp | 6 +++--- src/core/mixer.cpp | 2 +- src/core/note_play_handle.cpp | 2 +- src/core/song_editor.cpp | 2 +- src/tracks/instrument_track.cpp | 4 ++-- 9 files changed, 33 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a580c609..37c6e031c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-02-01 Danny McRae + * Makefile.am: + * src/tracks/instrument_track.cpp: + * src/core/note_play_handle.cpp: + * src/core/envelope_and_lfo_parameters.cpp: + * src/core/mixer.cpp: + * src/core/instrument_sound_shaping.cpp: + * src/core/instrument_midi_io.cpp: + * src/core/song_editor.cpp: + Some of the files have been renamed, so I updated the + include references to get the build to work again. + 2007-01-30 Paul Giblock * plugins/organic/organic.cpp: * plugins/organic/organic.h: diff --git a/Makefile.am b/Makefile.am index 8671b5bd0..b94147635 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,8 +63,8 @@ lmms_MOC = \ ./effect_control_dialog.moc \ ./effect_label.moc \ ./effect_select_dialog.moc \ - ./envelope_and_lfo_widget.moc \ - ./envelope_tab_widget.moc \ + ./envelope_and_lfo_parameters.moc \ + ./instrument_sound_shaping.moc \ ./export_project_dialog.moc \ ./fade_button.moc \ ./file_browser.moc \ @@ -81,7 +81,7 @@ lmms_MOC = \ ./nstate_button.moc \ ./meter_dialog.moc \ ./midi_alsa_seq.moc \ - ./midi_tab_widget.moc \ + ./instrument_midi_io.moc \ ./pattern.moc \ ./piano_roll.moc \ ./piano_widget.moc \ @@ -160,8 +160,8 @@ lmms_SOURCES = \ $(srcdir)/src/core/effect_select_dialog.cpp \ $(srcdir)/src/core/effect.cpp \ $(srcdir)/src/core/engine.cpp \ - $(srcdir)/src/core/envelope_and_lfo_widget.cpp \ - $(srcdir)/src/core/envelope_tab_widget.cpp \ + $(srcdir)/src/core/envelope_and_lfo_parameters.cpp \ + $(srcdir)/src/core/instrument_sound_shaping.cpp \ $(srcdir)/src/core/export_project_dialog.cpp \ $(srcdir)/src/core/file_browser.cpp \ $(srcdir)/src/core/import_filter.cpp \ @@ -172,7 +172,7 @@ lmms_SOURCES = \ $(srcdir)/src/core/main_window.cpp \ $(srcdir)/src/core/main.cpp \ $(srcdir)/src/core/meter_dialog.cpp \ - $(srcdir)/src/core/midi_tab_widget.cpp \ + $(srcdir)/src/core/instrument_midi_io.cpp \ $(srcdir)/src/core/mixer.cpp \ $(srcdir)/src/core/mv_base.cpp \ $(srcdir)/src/core/name_label.cpp \ @@ -284,8 +284,8 @@ lmms_SOURCES = \ $(srcdir)/include/note_play_handle.h \ $(srcdir)/include/piano_roll.h \ $(srcdir)/include/basic_filters.h \ - $(srcdir)/include/envelope_tab_widget.h \ - $(srcdir)/include/envelope_and_lfo_widget.h \ + $(srcdir)/include/instrument_sound_shaping.h \ + $(srcdir)/include/envelope_and_lfo_parameters.h \ $(srcdir)/include/about_dialog.h \ $(srcdir)/include/oscillator.h \ $(srcdir)/include/arp_and_chords_tab_widget.h \ @@ -350,7 +350,7 @@ lmms_SOURCES = \ $(srcdir)/include/dummy_instrument.h \ $(srcdir)/include/instrument_play_handle.h \ $(srcdir)/include/string_pair_drag.h \ - $(srcdir)/include/midi_tab_widget.h \ + $(srcdir)/include/instrument_midi_io.h \ $(srcdir)/include/audio_port.h \ $(srcdir)/include/tool.h \ $(srcdir)/include/tool_button.h \ diff --git a/src/core/envelope_and_lfo_parameters.cpp b/src/core/envelope_and_lfo_parameters.cpp index 9fe87b7e1..9af4fef9c 100644 --- a/src/core/envelope_and_lfo_parameters.cpp +++ b/src/core/envelope_and_lfo_parameters.cpp @@ -26,7 +26,7 @@ */ -#include "envelope_and_lfo_widget.h" +#include "envelope_and_lfo_parameters.h" #include @@ -1041,7 +1041,7 @@ void envelopeAndLFOWidget::lfoUserWaveChanged( void ) -#include "envelope_and_lfo_widget.moc" +#include "envelope_and_lfo_parameters.moc" #endif diff --git a/src/core/instrument_midi_io.cpp b/src/core/instrument_midi_io.cpp index c620a0848..5767cf5aa 100644 --- a/src/core/instrument_midi_io.cpp +++ b/src/core/instrument_midi_io.cpp @@ -31,7 +31,7 @@ #include -#include "midi_tab_widget.h" +#include "instrument_midi_io.h" #include "embed.h" #include "engine.h" #include "gui_templates.h" @@ -485,7 +485,7 @@ void midiTabWidget::activatedWriteablePort( QAction * _item ) -#include "midi_tab_widget.moc" +#include "instrument_midi_io.moc" #endif diff --git a/src/core/instrument_sound_shaping.cpp b/src/core/instrument_sound_shaping.cpp index 00c7df3bf..803f4a185 100644 --- a/src/core/instrument_sound_shaping.cpp +++ b/src/core/instrument_sound_shaping.cpp @@ -29,11 +29,11 @@ #include -#include "envelope_tab_widget.h" +#include "instrument_sound_shaping.h" #include "combobox.h" #include "embed.h" #include "engine.h" -#include "envelope_and_lfo_widget.h" +#include "envelope_and_lfo_parameters.h" #include "group_box.h" #include "gui_templates.h" #include "instrument_track.h" @@ -486,7 +486,7 @@ void envelopeTabWidget::loadSettings( const QDomElement & _this ) -#include "envelope_tab_widget.moc" +#include "instrument_sound_shaping.moc" diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp index 1a636ac30..c11940acf 100644 --- a/src/core/mixer.cpp +++ b/src/core/mixer.cpp @@ -31,7 +31,7 @@ #include "play_handle.h" #include "song_editor.h" #include "templates.h" -#include "envelope_and_lfo_widget.h" +#include "envelope_and_lfo_parameters.h" #include "debug.h" #include "engine.h" #include "config_mgr.h" diff --git a/src/core/note_play_handle.cpp b/src/core/note_play_handle.cpp index c8af5a3cb..af3ca2e42 100644 --- a/src/core/note_play_handle.cpp +++ b/src/core/note_play_handle.cpp @@ -30,7 +30,7 @@ #include "automatable_model_templates.h" #include "config_mgr.h" #include "detuning_helper.h" -#include "envelope_tab_widget.h" +#include "instrument_sound_shaping.h" #include "instrument_track.h" #include "midi_port.h" #include "song_editor.h" diff --git a/src/core/song_editor.cpp b/src/core/song_editor.cpp index 389bd0a5e..a4695b986 100644 --- a/src/core/song_editor.cpp +++ b/src/core/song_editor.cpp @@ -56,7 +56,7 @@ #include "config_mgr.h" #include "cpuload_widget.h" #include "embed.h" -#include "envelope_and_lfo_widget.h" +#include "envelope_and_lfo_parameters.h" #include "export_project_dialog.h" #include "import_filter.h" #include "instrument_track.h" diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 4e2e4ab08..0e064fbf9 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -53,7 +53,7 @@ #include "effect_rack_view.h" #include "embed.h" #include "engine.h" -#include "envelope_tab_widget.h" +#include "instrument_sound_shaping.h" #include "fade_button.h" #include "gui_templates.h" #include "instrument.h" @@ -61,7 +61,7 @@ #include "main_window.h" #include "midi_client.h" #include "midi_port.h" -#include "midi_tab_widget.h" +#include "instrument_midi_io.h" #include "mmp.h" #include "note_play_handle.h" #include "pattern.h"