- Plugin search path, out-of-process scan inventory overhaul refactor…

…ing... (6)

.gitignore

@@ -14,3 +14,4 @@ qrc_*.cpp
 .obj
 .ui
 qtractor
+qtractor_vst_scan

Makefile.git

@@ -8,5 +8,6 @@ configure:	 Makefile.in configure.ac
 clean:
 	@if [ -f Makefile ]; then make clean; fi
 	@rm -rvf Makefile configure config.* src/.ui src/.obj src/.moc
-	@rm -rvf src/Makefile src/config.* src/*.pri src/*.desktop src/*.mak
+	@rm -rvf src/config.* src/*.pri src/*.desktop
+	@rm -rvf src/Makefile src/Makefile.* src/*.mak src/*.mak.*
 	@rm -rvf *.cache *.log *.status *.spec *.mak

Makefile.in

@@ -2,7 +2,7 @@ prefix  = @ac_prefix@
 
 name    = qtractor
 
-target  = src/$(name)
+targets = src/$(name) src/$(name)_vst_scan 
 
 headers = \
 	src/config.h \
@@ -85,6 +85,7 @@ headers = \
 	src/qtractorObserverWidget.h \
 	src/qtractorOptions.h \
 	src/qtractorPlugin.h \
+	src/qtractorPluginPath.h \
 	src/qtractorPluginCommand.h \
 	src/qtractorPluginListView.h \
 	src/qtractorPropertyCommand.h \
@@ -131,7 +132,8 @@ headers = \
 	src/qtractorTakeRangeForm.h \
 	src/qtractorTempoAdjustForm.h \
 	src/qtractorTimeScaleForm.h \
-	src/qtractorTrackForm.h
+	src/qtractorTrackForm.h \
+	src/qtractor_vst_scan.h
 
 sources = \
 	src/qtractor.cpp \
@@ -205,6 +207,7 @@ sources = \
 	src/qtractorObserverWidget.cpp \
 	src/qtractorOptions.cpp \
 	src/qtractorPlugin.cpp \
+	src/qtractorPluginPath.cpp \
 	src/qtractorPluginCommand.cpp \
 	src/qtractorPluginListView.cpp \
 	src/qtractorRubberBand.cpp \
@@ -249,7 +252,8 @@ sources = \
 	src/qtractorTakeRangeForm.cpp \
 	src/qtractorTempoAdjustForm.cpp \
 	src/qtractorTimeScaleForm.cpp \
-	src/qtractorTrackForm.cpp
+	src/qtractorTrackForm.cpp \
+	src/qtractor_vst_scan.cpp
 
 forms = \
 	src/qtractorBusForm.ui \
@@ -311,10 +315,10 @@ export LUPDATE = @ac_lupdate@
 export LRELEASE = @ac_lrelease@
 
 
-all:	$(target)
+all:	$(targets)
 
 
-$(target):	$(name).mak $(resources) ${forms} $(sources) $(headers)
+$(targets):	$(name).mak $(resources) ${forms} $(sources) $(headers)
 	@$(MAKE) -f $(name).mak
 
 $(name).mak:	$(name).pro
@@ -330,7 +334,7 @@ translations_lrelease:	translations_lupdate $(translations_targets)
 	@$(LRELEASE) -verbose $< -qm $@
 
 
-install:	$(target) translations_lrelease $(name).1
+install:	$(targets) translations_lrelease $(name).1
 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install
 	@install -d -v -m 0755 $(DESTDIR)$(translations_dir)
 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
@@ -346,6 +350,5 @@ uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 
 clean:	$(name).mak
 	@$(MAKE) -f $(name).mak distclean
-	@rm -f $(target) $(target).mak $(name).mak
+	@rm -f $(targets) $(name).mak
 	@rm -rf *.cache *.log *.status $(translations_targets)
-

configure.ac

@@ -4,6 +4,7 @@ AC_INIT(Qtractor, 0.7.5.2, [email protected], qtractor)
 AC_CONFIG_SRCDIR(src/qtractor.cpp)
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_FILES(Makefile qtractor.spec src/src.pri src/qtractor.desktop)
+AC_CONFIG_FILES(src/qtractor_vst_scan.pri)
 
 # Set default installation prefix.
 AC_PREFIX_DEFAULT(/usr/local)

qtractor.pro

@@ -1,4 +1,8 @@
 # qtractor.pro
 #
 TEMPLATE = subdirs
-SUBDIRS = src
+SUBDIRS = src qtractor_vst_scan
+
+qtractor_vst_scan.file = src/qtractor_vst_scan.pro
+
+src.depends = qtractor_vst_scan

qtractor.spec.in

@@ -96,6 +96,7 @@ the personal home-studio.
 #dir %{_datadir}/man
 #dir %{_datadir}/man/man1
 %{_bindir}/%{name}
+%{_bindir}/%{name}_vst_scan
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png

src/qtractorLv2Plugin.cpp

@@ -25,6 +25,8 @@
 
 #include "qtractorLv2Plugin.h"
 
+#include "qtractorPluginPath.h"
+
 #if defined(CONFIG_LV2_EVENT) || defined(CONFIG_LV2_ATOM)
 #include "qtractorMidiManager.h"
 #endif

src/qtractorOptionsForm.cpp

@@ -28,7 +28,7 @@
 #include "qtractorMidiTimer.h"
 #include "qtractorMidiEditor.h"
 #include "qtractorTimeScale.h"
-#include "qtractorPlugin.h"
+#include "qtractorPluginPath.h"
 
 #include "qtractorAudioMeter.h"
 #include "qtractorMidiMeter.h"