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

Qt4- and MinGW-compatibility

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@416 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2006-09-25 19:41:07 +00:00
parent 60abfb14d7
commit c0b1c47bd0
32 changed files with 225 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/audio_file_processor/Makefile.am
View File

@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)
@@ -26,7 +26,7 @@ CLEANFILES = $(MOC_FILES) ./embedded_resources.h
pkglib_LTLIBRARIES= libaudiofileprocessor.la
pkglib_LTLIBRARIES = libaudiofileprocessor.la
libaudiofileprocessor_la_SOURCES = audio_file_processor.cpp audio_file_processor.h

1
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -49,7 +49,6 @@
#include "song_editor.h"
#include "instrument_track.h"
#include "note_play_handle.h"
#include "paths.h"
#include "interpolation.h"
#include "buffer_allocator.h"
#include "pixmap_button.h"

4
plugins/bit_invader/Makefile.am
View File

@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)
@@ -26,7 +26,7 @@ CLEANFILES = $(MOC_FILES) ./embedded_resources.h
pkglib_LTLIBRARIES= libbitinvader.la
pkglib_LTLIBRARIES = libbitinvader.la
libbitinvader_la_SOURCES = bit_invader.cpp bit_invader.h graph.cpp graph.h

4
plugins/ladspa_effect/Makefile.am
View File

@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign 1.4
#SUBDIRS = caps
SUBDIRS = caps
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I. -I../ladspa_base/
@@ -20,7 +20,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)

33
plugins/ladspa_effect/caps/Makefile.am Normal file
View File

@@ -0,0 +1,33 @@
AUTOMAKE_OPTIONS = foreign 1.4
AM_CXXFLAGS := $(AM_CXXFLAGS) -O6 -ffast-math -funroll-loops -ftracer
DEST = $(libdir)/$(PACKAGE)/ladspa
SOURCES = $(wildcard *.cc)
HDRS = $(wildcard *.h) $(wildcard dsp/*.h)
OBJECTS = $(SOURCES:.cc=.o)
caps.so: $(OBJECTS) depend
$(CXX) -nostartfiles $(AM_CXXFLAGS) -shared -o $@ $(OBJECTS)
clean:
rm -f *.o *.so *.s depend
install: all
strip caps.so
install -d $(DEST)
install -m 644 caps.so $(DEST)
uninstall:
-rm $(DEST)/caps.so
depend: $(SOURCES)
$(CXX) -MM $(AM_CXXFLAGS) $(SOURCES) > depend
.cc.o:
$(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) -c $<
all: caps.so
EXTRA_DIST = $(SOURCES) $(HDRS)

2
plugins/ladspa_effect/ladspa_effect.cpp
View File

@@ -23,6 +23,8 @@
*/
#include "qt3support.h"
#ifdef QT4
#include <QtGui/QMessageBox>

2
plugins/organic/Makefile.am
View File

@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)

2
plugins/plucked_string_synth/Makefile.am
View File

@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)

2
plugins/stk/mallets/Makefile.am
View File

@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)

32
plugins/stk/mallets/mallets.cpp
View File

@@ -111,9 +111,9 @@ void mallets::setWidgetBackground( QWidget * _widget, const QString & _pic )
{
#ifdef QT4
_widget->setAutoFillBackground( TRUE );
_widget->QPalette pal;
_widget->pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
_pic ) );
QPalette pal;
pal.setBrush( _widget->backgroundRole(),
PLUGIN_NAME::getIconPixmap( _pic.toAscii().constData() ) );
_widget->setPalette( pal );
#else
_widget->setErasePixmap( PLUGIN_NAME::getIconPixmap( _pic ) );
@@ -125,7 +125,7 @@ void mallets::setWidgetBackground( QWidget * _widget, const QString & _pic )
QWidget * mallets::setupModalBarControls( QWidget * _parent, track * _track )
{
QWidget * widget = new QWidget( _parent, "ModalBar" );
QWidget * widget = new QWidget( _parent );
widget->setFixedSize( 250, 250 );
m_hardness = new knob( knobBright_26, widget, tr( "Hardness" ),
@@ -176,7 +176,7 @@ QWidget * mallets::setupModalBarControls( QWidget * _parent, track * _track )
QWidget * mallets::setupTubeBellControls( QWidget * _parent, track * _track )
{
QWidget * widget = new QWidget( _parent, "TubeBellWidget" );
QWidget * widget = new QWidget( _parent );
widget->setFixedSize( 250, 250 );
m_modulator = new knob( knobBright_26, widget, tr( "Modulator" ),
@@ -228,7 +228,7 @@ QWidget * mallets::setupTubeBellControls( QWidget * _parent, track * _track )
QWidget * mallets::setupBandedWGControls( QWidget * _parent, track * _track )
{
// BandedWG
QWidget * widget = new QWidget( _parent, "BandedWGWidget" );
QWidget * widget = new QWidget( _parent );
widget->setFixedSize( 250, 250 );
m_strike = new ledCheckBox( tr( "Bowed" ), widget, tr( "Bowed" ),
@@ -520,7 +520,11 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
try
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( configManager::inst()->stkDir() );
Stk::setRawwavePath( configManager::inst()->stkDir()
#ifndef QT3
.toAscii().constData()
#endif
);
m_voice = new ModalBar();
@@ -566,7 +570,11 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
try
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( configManager::inst()->stkDir() );
Stk::setRawwavePath( configManager::inst()->stkDir()
#ifndef QT3
.toAscii().constData()
#endif
);
m_voice = new TubeBell();
@@ -610,8 +618,12 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
try
{
Stk::setSampleRate( _sample_rate );
Stk::setRawwavePath( configManager::inst()->stkDir() );
Stk::setRawwavePath( configManager::inst()->stkDir()
#ifndef QT3
.toAscii().constData()
#endif
);
m_voice = new BandedWG();
m_voice->controlChange( 1, 128.0 );

2
plugins/triple_oscillator/Makefile.am
View File

@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)

2
plugins/vestige/Makefile.am
View File

@@ -16,7 +16,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)

2
plugins/vibed/Makefile.am
View File

@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)

2
plugins/vst_effect/Makefile.am
View File

@@ -18,7 +18,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
EMBEDDED_RESOURCES = $(wildcard *png)
./embedded_resources.h: $(EMBEDDED_RESOURCES)
$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
$(BIN2RES) $(EMBEDDED_RESOURCES) > $@
EXTRA_DIST = $(EMBEDDED_RESOURCES)

4
plugins/vst_effect/vst_control_dialog.cpp
View File

@@ -47,7 +47,11 @@ vstControlDialog::vstControlDialog( QWidget * _parent,
QWidget * pw = m_effect->m_plugin->pluginWidget();
if( pw )
{
#ifndef QT3
pw->setParent( this );
#else
pw->reparent( this, QPoint( 0, 0 ) );
#endif
pw->show();
l->addWidget( pw );
}

5
plugins/vst_effect/vst_subplugin_features.cpp
View File

@@ -90,7 +90,12 @@ void vstSubPluginFeatures::listSubPluginKeys( engine * _eng,
plugin::descriptor * _desc, keyList & _kl )
{
QStringList dlls = QDir( configManager::inst()->vstDir() ).
#ifndef QT3
entryList( QStringList() << "*.dll",
QDir::Files, QDir::Name );
#else
entryList( "*.dll", QDir::Files, QDir::Name );
#endif
// TODO: eval m_type
for( QStringList::const_iterator it = dlls.begin();
it != dlls.end(); ++it )