From a080ed614ea6c7030349f26091014a355a2bb828 Mon Sep 17 00:00:00 2001 From: foam Date: Tue, 14 Jul 2015 12:17:55 +0100 Subject: [PATCH] mac changes and volume plugged in --- samplebrain/Makefile.in | 2 +- samplebrain/qt/MainWindow.h | 2 +- samplebrain/qt/Makefile | 263 +++++++++++------- samplebrain/qt/audio_thread.cpp | 12 +- samplebrain/qt/audio_thread.h | 2 +- samplebrain/qt/process_thread.cpp | 1 + samplebrain/src/aquila/filter/MelFilter.dep | 2 +- .../src/aquila/filter/MelFilterBank.dep | 4 +- samplebrain/src/aquila/transform/Dct.dep | 2 +- 9 files changed, 180 insertions(+), 110 deletions(-) diff --git a/samplebrain/Makefile.in b/samplebrain/Makefile.in index ae8125d..ab83e28 100644 --- a/samplebrain/Makefile.in +++ b/samplebrain/Makefile.in @@ -14,7 +14,7 @@ SRCS := src/fft.cpp \ TARGET_SRCS := src/main.cpp # @CFLAGS@ -CCFLAGS = -Ofast -march=native -mtune=native -std=c++11 -ffast-math -Wno-unused -Isrc +CCFLAGS = -Ofast -march=native -mtune=native -std=c++11 -ffast-math -Wno-unused -Isrc -I/opt/local/include LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/samplebrain/qt/MainWindow.h b/samplebrain/qt/MainWindow.h index 7e1dab0..ff6d73d 100644 --- a/samplebrain/qt/MainWindow.h +++ b/samplebrain/qt/MainWindow.h @@ -27,7 +27,7 @@ private slots: void fft1_end_slot(int s) { lo_send(m_audio_address,"/fft1_end","i",s); } void fft2_start_slot(int s){} // { m_renderer->get_params()->m_fft2_start=s; } void fft2_end_slot(int s){} // { m_renderer->get_params()->m_fft2_end=s; } - void volume_slot(int s){} // { m_renderer->set_volume(s/50.0f); } + void volume_slot(int s) { lo_send(m_audio_address,"/volume","f",s/100.0f); } void run_slot() {} void load_target() { QString s=QFileDialog::getOpenFileName( diff --git a/samplebrain/qt/Makefile b/samplebrain/qt/Makefile index a0dd1d9..b347243 100644 --- a/samplebrain/qt/Makefile +++ b/samplebrain/qt/Makefile @@ -1,41 +1,42 @@ ############################################################################# -# Makefile for building: samplebrain -# Generated by qmake (2.01a) (Qt 4.8.1) on: Sat Jul 11 18:25:22 2015 +# Makefile for building: samplebrain.app/Contents/MacOS/samplebrain +# Generated by qmake (2.01a) (Qt 4.8.7) on: Mon Jul 13 17:08:29 2015 # Project: samplebrain.pro # Template: app -# Command: /usr/bin/qmake -o Makefile samplebrain.pro +# Command: /opt/local/bin/qmake -o Makefile samplebrain.pro ############################################################################# ####### Compiler, tools and options -CC = gcc -CXX = g++ -DEFINES = -DQT_WEBKIT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/usr/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -I2 -I../src -I. -LINK = g++ -LFLAGS = -m64 -Wl,-O1 -LIBS = $(SUBLIBS) -L/usr/lib/x86_64-linux-gnu -L.. -lsamplebrain -ljellyfish -lportaudio -lfftw3 -lsndfile -llo -ldl -lm -lQtGui -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/bin/qmake +CC = /usr/bin/clang +CXX = /usr/bin/clang++ +DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O2 -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.10 -Wall -W $(DEFINES) +CXXFLAGS = -pipe -O2 -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.10 -Wall -W $(DEFINES) +INCPATH = -I/opt/local/share/qt4/mkspecs/macx-g++ -I. -I. -I/opt/local/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/opt/local/Library/Frameworks/QtGui.framework/Versions/4/Headers -I. -I2 -I../src -I/opt/local/Library/Frameworks/QtGui.framework/Versions/4/Headers -I/opt/local/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/opt/local/include -F/opt/local/Library/Frameworks -F/opt/local/lib +LINK = /usr/bin/clang++ +LFLAGS = -headerpad_max_install_names -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.10 +LIBS = $(SUBLIBS) -F/opt/local/Library/Frameworks -F/opt/local/lib -L.. -lsamplebrain -ljellyfish -lportaudio -lfftw3 -lsndfile -llo -ldl -lpthread -lm -F/opt/local/Library/Frameworks -F/opt/local/lib -L/opt/local/lib -framework QtGui -framework QtCore +AR = ar cq +RANLIB = ranlib -s +QMAKE = /opt/local/bin/qmake TAR = tar -cf COMPRESS = gzip -9f COPY = cp -f SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p +COPY_FILE = cp -f +COPY_DIR = cp -f -R +STRIP = +INSTALL_FILE = $(COPY_FILE) INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p +INSTALL_PROGRAM = $(COPY_FILE) DEL_FILE = rm -f SYMLINK = ln -f -s DEL_DIR = rmdir MOVE = mv -f CHK_DIR_EXISTS= test -d MKDIR = mkdir -p +export MACOSX_DEPLOYMENT_TARGET = 10.10 ####### Output directory @@ -52,34 +53,61 @@ OBJECTS = MainWindow.o \ process_thread.o \ qtmain.o \ moc_MainWindow.o -DIST = /usr/share/qt4/mkspecs/common/unix.conf \ - /usr/share/qt4/mkspecs/common/linux.conf \ - /usr/share/qt4/mkspecs/common/gcc-base.conf \ - /usr/share/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/share/qt4/mkspecs/common/g++-base.conf \ - /usr/share/qt4/mkspecs/common/g++-unix.conf \ - /usr/share/qt4/mkspecs/qconfig.pri \ - /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ - /usr/share/qt4/mkspecs/features/qt_functions.prf \ - /usr/share/qt4/mkspecs/features/qt_config.prf \ - /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/release.prf \ - /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/share/qt4/mkspecs/features/warn_on.prf \ - /usr/share/qt4/mkspecs/features/qt.prf \ - /usr/share/qt4/mkspecs/features/unix/thread.prf \ - /usr/share/qt4/mkspecs/features/moc.prf \ - /usr/share/qt4/mkspecs/features/resources.prf \ - /usr/share/qt4/mkspecs/features/uic.prf \ - /usr/share/qt4/mkspecs/features/yacc.prf \ - /usr/share/qt4/mkspecs/features/lex.prf \ - /usr/share/qt4/mkspecs/features/include_source_dir.prf \ +DIST = /opt/local/share/qt4/mkspecs/common/unix.conf \ + /opt/local/share/qt4/mkspecs/common/mac.conf \ + /opt/local/share/qt4/mkspecs/common/gcc-base.conf \ + /opt/local/share/qt4/mkspecs/common/gcc-base-macx.conf \ + /opt/local/share/qt4/mkspecs/common/g++-base.conf \ + /opt/local/share/qt4/mkspecs/common/g++-macx.conf \ + /opt/local/share/qt4/mkspecs/qconfig.pri \ + /opt/local/share/qt4/mkspecs/modules/qt_webkit_version.pri \ + /opt/local/share/qt4/mkspecs/features/qt_functions.prf \ + /opt/local/share/qt4/mkspecs/features/qt_config.prf \ + /opt/local/share/qt4/mkspecs/features/exclusive_builds.prf \ + /opt/local/share/qt4/mkspecs/features/default_pre.prf \ + /opt/local/share/qt4/mkspecs/features/mac/default_pre.prf \ + /opt/local/share/qt4/mkspecs/features/release.prf \ + /opt/local/share/qt4/mkspecs/features/default_post.prf \ + /opt/local/share/qt4/mkspecs/features/mac/default_post.prf \ + /opt/local/share/qt4/mkspecs/features/mac/x86_64.prf \ + /opt/local/share/qt4/mkspecs/features/mac/objective_cxx.prf \ + /opt/local/share/qt4/mkspecs/features/mac/objective_c.prf \ + /opt/local/share/qt4/mkspecs/features/mac/split_sources.prf \ + /opt/local/share/qt4/mkspecs/features/shared.prf \ + /opt/local/share/qt4/mkspecs/features/warn_on.prf \ + /opt/local/share/qt4/mkspecs/features/qt.prf \ + /opt/local/share/qt4/mkspecs/features/unix/thread.prf \ + /opt/local/share/qt4/mkspecs/features/moc.prf \ + /opt/local/share/qt4/mkspecs/features/mac/rez.prf \ + /opt/local/share/qt4/mkspecs/features/mac/sdk.prf \ + /opt/local/share/qt4/mkspecs/features/resources.prf \ + /opt/local/share/qt4/mkspecs/features/uic.prf \ + /opt/local/share/qt4/mkspecs/features/yacc.prf \ + /opt/local/share/qt4/mkspecs/features/lex.prf \ + /opt/local/share/qt4/mkspecs/features/include_source_dir.prf \ samplebrain.pro QMAKE_TARGET = samplebrain DESTDIR = -TARGET = samplebrain +TARGET = samplebrain.app/Contents/MacOS/samplebrain + +####### Custom Compiler Variables +QMAKE_COMP_QMAKE_OBJECTIVE_CXXFLAGS = -pipe \ + -O2 \ + -arch \ + x86_64 \ + -Xarch_x86_64 \ + -mmacosx-version-min=10.10 \ + -Wall \ + -W +QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS = -pipe \ + -O2 \ + -arch \ + x86_64 \ + -Xarch_x86_64 \ + -mmacosx-version-min=10.10 \ + -Wall \ + -W + first: all ####### Implicit rules @@ -103,67 +131,96 @@ first: all ####### Build rules -all: Makefile $(TARGET) +all: Makefile samplebrain.app/Contents/PkgInfo samplebrain.app/Contents/Resources/empty.lproj samplebrain.app/Contents/Info.plist $(TARGET) $(TARGET): $(OBJECTS) + @$(CHK_DIR_EXISTS) samplebrain.app/Contents/MacOS/ || $(MKDIR) samplebrain.app/Contents/MacOS/ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) -Makefile: samplebrain.pro /usr/share/qt4/mkspecs/linux-g++-64/qmake.conf /usr/share/qt4/mkspecs/common/unix.conf \ - /usr/share/qt4/mkspecs/common/linux.conf \ - /usr/share/qt4/mkspecs/common/gcc-base.conf \ - /usr/share/qt4/mkspecs/common/gcc-base-unix.conf \ - /usr/share/qt4/mkspecs/common/g++-base.conf \ - /usr/share/qt4/mkspecs/common/g++-unix.conf \ - /usr/share/qt4/mkspecs/qconfig.pri \ - /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ - /usr/share/qt4/mkspecs/features/qt_functions.prf \ - /usr/share/qt4/mkspecs/features/qt_config.prf \ - /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/release.prf \ - /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ - /usr/share/qt4/mkspecs/features/warn_on.prf \ - /usr/share/qt4/mkspecs/features/qt.prf \ - /usr/share/qt4/mkspecs/features/unix/thread.prf \ - /usr/share/qt4/mkspecs/features/moc.prf \ - /usr/share/qt4/mkspecs/features/resources.prf \ - /usr/share/qt4/mkspecs/features/uic.prf \ - /usr/share/qt4/mkspecs/features/yacc.prf \ - /usr/share/qt4/mkspecs/features/lex.prf \ - /usr/share/qt4/mkspecs/features/include_source_dir.prf \ - /usr/lib/x86_64-linux-gnu/libQtGui.prl \ - /usr/lib/x86_64-linux-gnu/libQtCore.prl +Makefile: samplebrain.pro /opt/local/share/qt4/mkspecs/macx-g++/qmake.conf /opt/local/share/qt4/mkspecs/common/unix.conf \ + /opt/local/share/qt4/mkspecs/common/mac.conf \ + /opt/local/share/qt4/mkspecs/common/gcc-base.conf \ + /opt/local/share/qt4/mkspecs/common/gcc-base-macx.conf \ + /opt/local/share/qt4/mkspecs/common/g++-base.conf \ + /opt/local/share/qt4/mkspecs/common/g++-macx.conf \ + /opt/local/share/qt4/mkspecs/qconfig.pri \ + /opt/local/share/qt4/mkspecs/modules/qt_webkit_version.pri \ + /opt/local/share/qt4/mkspecs/features/qt_functions.prf \ + /opt/local/share/qt4/mkspecs/features/qt_config.prf \ + /opt/local/share/qt4/mkspecs/features/exclusive_builds.prf \ + /opt/local/share/qt4/mkspecs/features/default_pre.prf \ + /opt/local/share/qt4/mkspecs/features/mac/default_pre.prf \ + /opt/local/share/qt4/mkspecs/features/release.prf \ + /opt/local/share/qt4/mkspecs/features/default_post.prf \ + /opt/local/share/qt4/mkspecs/features/mac/default_post.prf \ + /opt/local/share/qt4/mkspecs/features/mac/x86_64.prf \ + /opt/local/share/qt4/mkspecs/features/mac/objective_cxx.prf \ + /opt/local/share/qt4/mkspecs/features/mac/objective_c.prf \ + /opt/local/share/qt4/mkspecs/features/mac/split_sources.prf \ + /opt/local/share/qt4/mkspecs/features/shared.prf \ + /opt/local/share/qt4/mkspecs/features/warn_on.prf \ + /opt/local/share/qt4/mkspecs/features/qt.prf \ + /opt/local/share/qt4/mkspecs/features/unix/thread.prf \ + /opt/local/share/qt4/mkspecs/features/moc.prf \ + /opt/local/share/qt4/mkspecs/features/mac/rez.prf \ + /opt/local/share/qt4/mkspecs/features/mac/sdk.prf \ + /opt/local/share/qt4/mkspecs/features/resources.prf \ + /opt/local/share/qt4/mkspecs/features/uic.prf \ + /opt/local/share/qt4/mkspecs/features/yacc.prf \ + /opt/local/share/qt4/mkspecs/features/lex.prf \ + /opt/local/share/qt4/mkspecs/features/include_source_dir.prf \ + /opt/local/Library/Frameworks/QtGui.framework/QtGui.prl \ + /opt/local/Library/Frameworks/QtCore.framework/QtCore.prl $(QMAKE) -o Makefile samplebrain.pro -/usr/share/qt4/mkspecs/common/unix.conf: -/usr/share/qt4/mkspecs/common/linux.conf: -/usr/share/qt4/mkspecs/common/gcc-base.conf: -/usr/share/qt4/mkspecs/common/gcc-base-unix.conf: -/usr/share/qt4/mkspecs/common/g++-base.conf: -/usr/share/qt4/mkspecs/common/g++-unix.conf: -/usr/share/qt4/mkspecs/qconfig.pri: -/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri: -/usr/share/qt4/mkspecs/features/qt_functions.prf: -/usr/share/qt4/mkspecs/features/qt_config.prf: -/usr/share/qt4/mkspecs/features/exclusive_builds.prf: -/usr/share/qt4/mkspecs/features/default_pre.prf: -/usr/share/qt4/mkspecs/features/release.prf: -/usr/share/qt4/mkspecs/features/default_post.prf: -/usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf: -/usr/share/qt4/mkspecs/features/warn_on.prf: -/usr/share/qt4/mkspecs/features/qt.prf: -/usr/share/qt4/mkspecs/features/unix/thread.prf: -/usr/share/qt4/mkspecs/features/moc.prf: -/usr/share/qt4/mkspecs/features/resources.prf: -/usr/share/qt4/mkspecs/features/uic.prf: -/usr/share/qt4/mkspecs/features/yacc.prf: -/usr/share/qt4/mkspecs/features/lex.prf: -/usr/share/qt4/mkspecs/features/include_source_dir.prf: -/usr/lib/x86_64-linux-gnu/libQtGui.prl: -/usr/lib/x86_64-linux-gnu/libQtCore.prl: +/opt/local/share/qt4/mkspecs/common/unix.conf: +/opt/local/share/qt4/mkspecs/common/mac.conf: +/opt/local/share/qt4/mkspecs/common/gcc-base.conf: +/opt/local/share/qt4/mkspecs/common/gcc-base-macx.conf: +/opt/local/share/qt4/mkspecs/common/g++-base.conf: +/opt/local/share/qt4/mkspecs/common/g++-macx.conf: +/opt/local/share/qt4/mkspecs/qconfig.pri: +/opt/local/share/qt4/mkspecs/modules/qt_webkit_version.pri: +/opt/local/share/qt4/mkspecs/features/qt_functions.prf: +/opt/local/share/qt4/mkspecs/features/qt_config.prf: +/opt/local/share/qt4/mkspecs/features/exclusive_builds.prf: +/opt/local/share/qt4/mkspecs/features/default_pre.prf: +/opt/local/share/qt4/mkspecs/features/mac/default_pre.prf: +/opt/local/share/qt4/mkspecs/features/release.prf: +/opt/local/share/qt4/mkspecs/features/default_post.prf: +/opt/local/share/qt4/mkspecs/features/mac/default_post.prf: +/opt/local/share/qt4/mkspecs/features/mac/x86_64.prf: +/opt/local/share/qt4/mkspecs/features/mac/objective_cxx.prf: +/opt/local/share/qt4/mkspecs/features/mac/objective_c.prf: +/opt/local/share/qt4/mkspecs/features/mac/split_sources.prf: +/opt/local/share/qt4/mkspecs/features/shared.prf: +/opt/local/share/qt4/mkspecs/features/warn_on.prf: +/opt/local/share/qt4/mkspecs/features/qt.prf: +/opt/local/share/qt4/mkspecs/features/unix/thread.prf: +/opt/local/share/qt4/mkspecs/features/moc.prf: +/opt/local/share/qt4/mkspecs/features/mac/rez.prf: +/opt/local/share/qt4/mkspecs/features/mac/sdk.prf: +/opt/local/share/qt4/mkspecs/features/resources.prf: +/opt/local/share/qt4/mkspecs/features/uic.prf: +/opt/local/share/qt4/mkspecs/features/yacc.prf: +/opt/local/share/qt4/mkspecs/features/lex.prf: +/opt/local/share/qt4/mkspecs/features/include_source_dir.prf: +/opt/local/Library/Frameworks/QtGui.framework/QtGui.prl: +/opt/local/Library/Frameworks/QtCore.framework/QtCore.prl: qmake: FORCE @$(QMAKE) -o Makefile samplebrain.pro +samplebrain.app/Contents/PkgInfo: + @$(CHK_DIR_EXISTS) samplebrain.app/Contents || $(MKDIR) samplebrain.app/Contents + @$(DEL_FILE) samplebrain.app/Contents/PkgInfo + @echo "APPL????" >samplebrain.app/Contents/PkgInfo +samplebrain.app/Contents/Resources/empty.lproj: + @$(CHK_DIR_EXISTS) samplebrain.app/Contents/Resources || $(MKDIR) samplebrain.app/Contents/Resources + @touch samplebrain.app/Contents/Resources/empty.lproj + +samplebrain.app/Contents/Info.plist: + @$(CHK_DIR_EXISTS) samplebrain.app/Contents || $(MKDIR) samplebrain.app/Contents + @$(DEL_FILE) samplebrain.app/Contents/Info.plist + @sed -e "s,@SHORT_VERSION@,1.0,g" -e "s,@TYPEINFO@,????,g" -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,samplebrain,g" -e "s,@TYPEINFO@,????,g" /opt/local/share/qt4/mkspecs/macx-g++/Info.plist.app >samplebrain.app/Contents/Info.plist dist: @$(CHK_DIR_EXISTS) .tmp/samplebrain1.0.0 || $(MKDIR) .tmp/samplebrain1.0.0 $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/samplebrain1.0.0/ && $(COPY_FILE) --parents MainWindow.h generated/ui_samplebrain.h .tmp/samplebrain1.0.0/ && $(COPY_FILE) --parents MainWindow.cpp audio_thread.cpp process_thread.cpp qtmain.cpp .tmp/samplebrain1.0.0/ && (cd `dirname .tmp/samplebrain1.0.0` && $(TAR) samplebrain1.0.0.tar samplebrain1.0.0 && $(COMPRESS) samplebrain1.0.0.tar) && $(MOVE) `dirname .tmp/samplebrain1.0.0`/samplebrain1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/samplebrain1.0.0 @@ -177,7 +234,7 @@ clean:compiler_clean ####### Sub-libraries distclean: clean - -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) -r samplebrain.app -$(DEL_FILE) Makefile @@ -187,12 +244,16 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all +compiler_objective_cxx_make_all: +compiler_objective_cxx_clean: +compiler_objective_c_make_all: +compiler_objective_c_clean: compiler_moc_header_make_all: moc_MainWindow.cpp compiler_moc_header_clean: -$(DEL_FILE) moc_MainWindow.cpp moc_MainWindow.cpp: generated/ui_samplebrain.h \ MainWindow.h - /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) MainWindow.h -o moc_MainWindow.cpp + /opt/local/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ MainWindow.h -o moc_MainWindow.cpp compiler_rcc_make_all: compiler_rcc_clean: @@ -201,6 +262,8 @@ compiler_image_collection_clean: -$(DEL_FILE) qmake_image_collection.cpp compiler_moc_source_make_all: compiler_moc_source_clean: +compiler_rez_source_make_all: +compiler_rez_source_clean: compiler_uic_make_all: compiler_uic_clean: compiler_yacc_decl_make_all: diff --git a/samplebrain/qt/audio_thread.cpp b/samplebrain/qt/audio_thread.cpp index 9c64fd6..24f4ada 100644 --- a/samplebrain/qt/audio_thread.cpp +++ b/samplebrain/qt/audio_thread.cpp @@ -26,10 +26,11 @@ void audio_thread::start_audio() { void audio_thread::run_audio(void* c, unsigned int frames) { audio_thread *at = (audio_thread*)c; at->m_audio_device->left_out.zero(); - at->process(at->m_audio_device->left_out); + at->process(at->m_audio_device->left_out, + at->m_audio_device->right_out); } -void audio_thread::process(sample &s) { +void audio_thread::process(sample &s, sample &s2) { command_ring_buffer::command cmd; while (m_osc.get(cmd)) { @@ -58,13 +59,18 @@ void audio_thread::process(sample &s) { } if (name=="/restart_audio") { start_audio(); - } + } + if (name=="/volume") { + m_renderer->set_volume(cmd.get_float(0)*10); + } } s.zero(); + s2.zero(); if (!pthread_mutex_trylock(m_brain_mutex)) { m_renderer->process(s.get_length(),s.get_non_const_buffer()); pthread_mutex_unlock(m_brain_mutex); + s2=s; } else { cerr<<"audio no lock..."< +#include using namespace spiralcore; using namespace std; diff --git a/samplebrain/src/aquila/filter/MelFilter.dep b/samplebrain/src/aquila/filter/MelFilter.dep index a8f6135..7f839c8 100644 --- a/samplebrain/src/aquila/filter/MelFilter.dep +++ b/samplebrain/src/aquila/filter/MelFilter.dep @@ -1,2 +1,2 @@ MelFilter.o: src/aquila/filter/MelFilter.cpp \ - src/aquila/filter/MelFilter.h src/aquila/filter/../global.h + src/aquila/filter/MelFilter.h src/aquila/filter/../global.h diff --git a/samplebrain/src/aquila/filter/MelFilterBank.dep b/samplebrain/src/aquila/filter/MelFilterBank.dep index 66f6b52..c185fee 100644 --- a/samplebrain/src/aquila/filter/MelFilterBank.dep +++ b/samplebrain/src/aquila/filter/MelFilterBank.dep @@ -1,3 +1,3 @@ MelFilterBank.o: src/aquila/filter/MelFilterBank.cpp \ - src/aquila/filter/MelFilterBank.h src/aquila/filter/../global.h \ - src/aquila/filter/MelFilter.h + src/aquila/filter/MelFilterBank.h src/aquila/filter/../global.h \ + src/aquila/filter/MelFilter.h diff --git a/samplebrain/src/aquila/transform/Dct.dep b/samplebrain/src/aquila/transform/Dct.dep index 42a89f3..728d5d1 100644 --- a/samplebrain/src/aquila/transform/Dct.dep +++ b/samplebrain/src/aquila/transform/Dct.dep @@ -1,2 +1,2 @@ Dct.o: src/aquila/transform/Dct.cpp src/aquila/transform/Dct.h \ - src/aquila/transform/../global.h + src/aquila/transform/../global.h