summaryrefslogtreecommitdiffstats
path: root/arts/modules/effects
diff options
context:
space:
mode:
Diffstat (limited to 'arts/modules/effects')
-rw-r--r--arts/modules/effects/CMakeLists.txt20
-rw-r--r--arts/modules/effects/Makefile.am22
-rw-r--r--arts/modules/effects/artsmoduleseffects.idl2
-rw-r--r--arts/modules/effects/effect_wavecapture_impl.cpp (renamed from arts/modules/effects/effect_wavecapture_impl.cc)2
-rw-r--r--arts/modules/effects/fivebandmonocomplexeq_impl.cpp (renamed from arts/modules/effects/fivebandmonocomplexeq_impl.cc)0
-rw-r--r--arts/modules/effects/freeverb/allpass.cpp2
-rw-r--r--arts/modules/effects/freeverb/allpass.h (renamed from arts/modules/effects/freeverb/allpass.hpp)0
-rw-r--r--arts/modules/effects/freeverb/comb.cpp2
-rw-r--r--arts/modules/effects/freeverb/comb.h (renamed from arts/modules/effects/freeverb/comb.hpp)0
-rw-r--r--arts/modules/effects/freeverb/revmodel.cpp2
-rw-r--r--arts/modules/effects/freeverb/revmodel.h (renamed from arts/modules/effects/freeverb/revmodel.hpp)4
-rw-r--r--arts/modules/effects/freeverbguifactory_impl.cpp (renamed from arts/modules/effects/freeverbguifactory_impl.cc)0
-rw-r--r--arts/modules/effects/kstereovolumecontrolgui_impl.cpp4
-rw-r--r--arts/modules/effects/kstereovolumecontrolgui_impl.h5
-rw-r--r--arts/modules/effects/monostereoconversion_impl.cpp (renamed from arts/modules/effects/monostereoconversion_impl.cc)0
-rw-r--r--arts/modules/effects/stereocompressorguifactory_impl.cpp (renamed from arts/modules/effects/stereocompressorguifactory_impl.cc)3
-rw-r--r--arts/modules/effects/stereovolumecontrolguifactory_impl.cpp2
-rw-r--r--arts/modules/effects/synth_freeverb_impl.cpp (renamed from arts/modules/effects/synth_freeverb_impl.cc)2
-rw-r--r--arts/modules/effects/synth_stereo_compressor_impl.cpp (renamed from arts/modules/effects/synth_stereo_compressor_impl.cc)3
-rw-r--r--arts/modules/effects/synth_stereo_fir_equalizer_impl.cpp (renamed from arts/modules/effects/synth_stereo_fir_equalizer_impl.cc)0
-rw-r--r--arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cpp (renamed from arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cc)0
-rw-r--r--arts/modules/effects/synth_stereo_pitch_shift_impl.cpp (renamed from arts/modules/effects/synth_stereo_pitch_shift_impl.cc)0
-rw-r--r--arts/modules/effects/synth_voice_removal_impl.cpp (renamed from arts/modules/effects/synth_voice_removal_impl.cc)2
-rw-r--r--arts/modules/effects/voiceremovalguifactory_impl.cpp (renamed from arts/modules/effects/voiceremovalguifactory_impl.cc)2
24 files changed, 31 insertions, 48 deletions
diff --git a/arts/modules/effects/CMakeLists.txt b/arts/modules/effects/CMakeLists.txt
index 58c847d9..a5136f08 100644
--- a/arts/modules/effects/CMakeLists.txt
+++ b/arts/modules/effects/CMakeLists.txt
@@ -38,15 +38,15 @@ link_directories(
tde_add_library( artsmoduleseffects SHARED AUTOMOC
SOURCES
- artsmoduleseffects.cc
- fivebandmonocomplexeq_impl.cc
- monostereoconversion_impl.cc
- synth_stereo_pitch_shift_impl.cc synth_stereo_pitch_shift_fft_impl.cc
- synth_voice_removal_impl.cc voiceremovalguifactory_impl.cc
- synth_stereo_compressor_impl.cc stereocompressorguifactory_impl.cc
- synth_stereo_fir_equalizer_impl.cc
- synth_freeverb_impl.cc freeverbguifactory_impl.cc
- effect_wavecapture_impl.cc
+ artsmoduleseffects.cpp
+ fivebandmonocomplexeq_impl.cpp
+ monostereoconversion_impl.cpp
+ synth_stereo_pitch_shift_impl.cpp synth_stereo_pitch_shift_fft_impl.cpp
+ synth_voice_removal_impl.cpp voiceremovalguifactory_impl.cpp
+ synth_stereo_compressor_impl.cpp stereocompressorguifactory_impl.cpp
+ synth_stereo_fir_equalizer_impl.cpp
+ synth_freeverb_impl.cpp freeverbguifactory_impl.cpp
+ effect_wavecapture_impl.cpp
kstereovolumecontrolgui_impl.cpp stereovolumecontrolguifactory_impl.cpp
VERSION 0.0.0
EMBED
@@ -60,7 +60,7 @@ tde_add_library( artsmoduleseffects SHARED AUTOMOC
add_custom_command(
OUTPUT
- artsmoduleseffects.cc artsmoduleseffects.h
+ artsmoduleseffects.cpp artsmoduleseffects.h
artsmoduleseffects.mcopclass artsmoduleseffects.mcoptype
COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
-I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/effects/Makefile.am b/arts/modules/effects/Makefile.am
index d5d54aad..a2c3f31f 100644
--- a/arts/modules/effects/Makefile.am
+++ b/arts/modules/effects/Makefile.am
@@ -20,15 +20,15 @@ INCLUDES = \
lib_LTLIBRARIES = libartsmoduleseffects.la
-libartsmoduleseffects_la_SOURCES = artsmoduleseffects.cc \
- fivebandmonocomplexeq_impl.cc \
- monostereoconversion_impl.cc \
- synth_stereo_pitch_shift_impl.cc synth_stereo_pitch_shift_fft_impl.cc \
- synth_voice_removal_impl.cc voiceremovalguifactory_impl.cc \
- synth_stereo_compressor_impl.cc stereocompressorguifactory_impl.cc \
- synth_stereo_fir_equalizer_impl.cc \
- synth_freeverb_impl.cc freeverbguifactory_impl.cc \
- effect_wavecapture_impl.cc \
+libartsmoduleseffects_la_SOURCES = artsmoduleseffects.cpp \
+ fivebandmonocomplexeq_impl.cpp \
+ monostereoconversion_impl.cpp \
+ synth_stereo_pitch_shift_impl.cpp synth_stereo_pitch_shift_fft_impl.cpp \
+ synth_voice_removal_impl.cpp voiceremovalguifactory_impl.cpp \
+ synth_stereo_compressor_impl.cpp stereocompressorguifactory_impl.cpp \
+ synth_stereo_fir_equalizer_impl.cpp \
+ synth_freeverb_impl.cpp freeverbguifactory_impl.cpp \
+ effect_wavecapture_impl.cpp \
kstereovolumecontrolgui_impl.cpp stereovolumecontrolguifactory_impl.cpp
libartsmoduleseffects_la_COMPILE_FIRST = ../../gui/common/artsgui.h \
../common/artsmodulescommon.h ../../midi/artsmidi.h ../synth/artsmodulessynth.h \
@@ -44,10 +44,10 @@ libartsmoduleseffects_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-unde
METASOURCES=AUTO
-artsmoduleseffects.cc artsmoduleseffects.h artsmoduleseffects.mcoptype artsmoduleseffects.mcopclass: $(srcdir)/artsmoduleseffects.idl $(MCOPIDL)
+artsmoduleseffects.cpp artsmoduleseffects.h artsmoduleseffects.mcoptype artsmoduleseffects.mcopclass: $(srcdir)/artsmoduleseffects.idl $(MCOPIDL)
$(MCOPIDL) -t $(INCLUDES) $(srcdir)/artsmoduleseffects.idl
-DISTCLEANFILES= artsmoduleseffects.cc artsmoduleseffects.h artsmoduleseffects.mcop*
+DISTCLEANFILES= artsmoduleseffects.cpp artsmoduleseffects.h artsmoduleseffects.mcop*
artsincludedir = $(includedir)/arts
artsinclude_HEADERS = artsmoduleseffects.h artsmoduleseffects.idl
diff --git a/arts/modules/effects/artsmoduleseffects.idl b/arts/modules/effects/artsmoduleseffects.idl
index 13e978d9..9d7cd871 100644
--- a/arts/modules/effects/artsmoduleseffects.idl
+++ b/arts/modules/effects/artsmoduleseffects.idl
@@ -18,7 +18,7 @@
*/
/*
- * DISCLAIMER: The interfaces in envmixer.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in envmixer.idl (and the derived .cpp/.h files)
* DO NOT GUARANTEE BINARY COMPATIBILITY YET.
*
* They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/effects/effect_wavecapture_impl.cc b/arts/modules/effects/effect_wavecapture_impl.cpp
index 430c4fad..639307a8 100644
--- a/arts/modules/effects/effect_wavecapture_impl.cc
+++ b/arts/modules/effects/effect_wavecapture_impl.cpp
@@ -59,5 +59,3 @@ void Effect_WAVECAPTURE_impl::streamEnd()
REGISTER_IMPLEMENTATION(Effect_WAVECAPTURE_impl);
}
-
-// vim:ts=4:sw=4
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cpp
index 59d0ef44..59d0ef44 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cpp
diff --git a/arts/modules/effects/freeverb/allpass.cpp b/arts/modules/effects/freeverb/allpass.cpp
index ca4d8bc5..850337e3 100644
--- a/arts/modules/effects/freeverb/allpass.cpp
+++ b/arts/modules/effects/freeverb/allpass.cpp
@@ -4,7 +4,7 @@
// http://www.dreampoint.co.uk
// This code is public domain
-#include "allpass.hpp"
+#include "allpass.h"
allpass::allpass()
{
diff --git a/arts/modules/effects/freeverb/allpass.hpp b/arts/modules/effects/freeverb/allpass.h
index 853c7d41..853c7d41 100644
--- a/arts/modules/effects/freeverb/allpass.hpp
+++ b/arts/modules/effects/freeverb/allpass.h
diff --git a/arts/modules/effects/freeverb/comb.cpp b/arts/modules/effects/freeverb/comb.cpp
index c05f5069..62be706d 100644
--- a/arts/modules/effects/freeverb/comb.cpp
+++ b/arts/modules/effects/freeverb/comb.cpp
@@ -4,7 +4,7 @@
// http://www.dreampoint.co.uk
// This code is public domain
-#include "comb.hpp"
+#include "comb.h"
comb::comb()
{
diff --git a/arts/modules/effects/freeverb/comb.hpp b/arts/modules/effects/freeverb/comb.h
index 4a73b615..4a73b615 100644
--- a/arts/modules/effects/freeverb/comb.hpp
+++ b/arts/modules/effects/freeverb/comb.h
diff --git a/arts/modules/effects/freeverb/revmodel.cpp b/arts/modules/effects/freeverb/revmodel.cpp
index 23a766cc..3688dd34 100644
--- a/arts/modules/effects/freeverb/revmodel.cpp
+++ b/arts/modules/effects/freeverb/revmodel.cpp
@@ -4,7 +4,7 @@
// http://www.dreampoint.co.uk
// This code is public domain
-#include "revmodel.hpp"
+#include "revmodel.h"
revmodel::revmodel()
{
diff --git a/arts/modules/effects/freeverb/revmodel.hpp b/arts/modules/effects/freeverb/revmodel.h
index ca6c89a0..aec39dfe 100644
--- a/arts/modules/effects/freeverb/revmodel.hpp
+++ b/arts/modules/effects/freeverb/revmodel.h
@@ -7,8 +7,8 @@
#ifndef _revmodel_
#define _revmodel_
-#include "comb.hpp"
-#include "allpass.hpp"
+#include "comb.h"
+#include "allpass.h"
#include "tuning.h"
class revmodel
diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cpp
index 4b5d4d34..4b5d4d34 100644
--- a/arts/modules/effects/freeverbguifactory_impl.cc
+++ b/arts/modules/effects/freeverbguifactory_impl.cpp
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
index e6e0c54c..d7f8d30b 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
@@ -30,7 +30,7 @@ using namespace Arts;
KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) )
{
//kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl;
- _mapper = new KStereoVolumeControlGui_EventMapper( this, TQT_TQOBJECT(_qframe) );
+ _mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe );
this->addWidget( _label, -100 );
_label.bottom( Arts::East );
_label.text( "Volume" );
@@ -126,7 +126,5 @@ void KStereoVolumeControlGui_impl::updateValues() {
}
REGISTER_IMPLEMENTATION( KStereoVolumeControlGui_impl );
-
-// vim: sw=4 ts=4
#include "kstereovolumecontrolgui_impl.moc"
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h
index b562b988..ff5d96dd 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.h
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h
@@ -80,7 +80,7 @@ private:
#include <tqtimer.h>
class KStereoVolumeControlGui_EventMapper : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
TQTimer* _timer;
@@ -88,11 +88,10 @@ public:
public:
KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) {
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) );
+ connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimerSignal() ) );
}
public slots:
void slotTimerSignal() { _impl->updateValues(); }
};
#endif
-// vim: sw=4 ts=4
diff --git a/arts/modules/effects/monostereoconversion_impl.cc b/arts/modules/effects/monostereoconversion_impl.cpp
index 9bf1bbee..9bf1bbee 100644
--- a/arts/modules/effects/monostereoconversion_impl.cc
+++ b/arts/modules/effects/monostereoconversion_impl.cpp
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cpp
index 0dd523e8..295ad65d 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cpp
@@ -106,9 +106,6 @@ public:
return hbox;
}
};
-
-// vim:sw=4:ts=4
-
REGISTER_IMPLEMENTATION(StereoCompressorGuiFactory_impl);
}
diff --git a/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp b/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp
index 5a5e2a06..5db32751 100644
--- a/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp
+++ b/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp
@@ -41,5 +41,3 @@ public:
REGISTER_IMPLEMENTATION( StereoVolumeControlGuiFactory_impl );
}
-// vim: sw=4 ts=4
-
diff --git a/arts/modules/effects/synth_freeverb_impl.cc b/arts/modules/effects/synth_freeverb_impl.cpp
index a1f35d06..3b882d48 100644
--- a/arts/modules/effects/synth_freeverb_impl.cc
+++ b/arts/modules/effects/synth_freeverb_impl.cpp
@@ -20,7 +20,7 @@
*/
-#include "freeverb/revmodel.hpp"
+#include "freeverb/revmodel.h"
#include "artsmoduleseffects.h"
#include "stdsynthmodule.h"
diff --git a/arts/modules/effects/synth_stereo_compressor_impl.cc b/arts/modules/effects/synth_stereo_compressor_impl.cpp
index 2707c334..3add8d46 100644
--- a/arts/modules/effects/synth_stereo_compressor_impl.cc
+++ b/arts/modules/effects/synth_stereo_compressor_impl.cpp
@@ -127,9 +127,6 @@ private:
}
};
-
-// vim:sw=4:ts=4
-
REGISTER_IMPLEMENTATION(Synth_STEREO_COMPRESSOR_impl);
}
diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cpp
index 8f15a4dc..8f15a4dc 100644
--- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
+++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cpp
diff --git a/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cc b/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cpp
index 390fd04e..390fd04e 100644
--- a/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cc
+++ b/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cpp
diff --git a/arts/modules/effects/synth_stereo_pitch_shift_impl.cc b/arts/modules/effects/synth_stereo_pitch_shift_impl.cpp
index fbf7bb07..fbf7bb07 100644
--- a/arts/modules/effects/synth_stereo_pitch_shift_impl.cc
+++ b/arts/modules/effects/synth_stereo_pitch_shift_impl.cpp
diff --git a/arts/modules/effects/synth_voice_removal_impl.cc b/arts/modules/effects/synth_voice_removal_impl.cpp
index e35949a0..2ade0879 100644
--- a/arts/modules/effects/synth_voice_removal_impl.cc
+++ b/arts/modules/effects/synth_voice_removal_impl.cpp
@@ -104,5 +104,3 @@ public:
};
REGISTER_IMPLEMENTATION(Synth_VOICE_REMOVAL_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/modules/effects/voiceremovalguifactory_impl.cc b/arts/modules/effects/voiceremovalguifactory_impl.cpp
index d4879b87..dc9dce20 100644
--- a/arts/modules/effects/voiceremovalguifactory_impl.cc
+++ b/arts/modules/effects/voiceremovalguifactory_impl.cpp
@@ -72,5 +72,3 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object )
return hbox;
}
-
-// vim: ts=4 sw=4