deepblue/samplebrain
1
0
Fork 0
mirror of https://gitlab.com/then-try-this/samplebrain.git synced 2025-05-12 18:47:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mac changes and volume plugged in

Browse Source
This commit is contained in:
foam 2015-07-14 12:17:55 +01:00
parent 1f9fde78db
commit a080ed614e
9 changed files with 180 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samplebrain/Makefile.in
View File

@ -14,7 +14,7 @@ SRCS := src/fft.cpp \
TARGET_SRCS := src/main.cpp TARGET_SRCS := src/main.cpp
# @CFLAGS@ # @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@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@

2
samplebrain/qt/MainWindow.h
View File

@ -27,7 +27,7 @@ private slots:
void fft1_end_slot(int s) { lo_send(m_audio_address,"/fft1_end","i",s); } 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_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 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 run_slot() {}
void load_target() { void load_target() {
QString s=QFileDialog::getOpenFileName( QString s=QFileDialog::getOpenFileName(

263
samplebrain/qt/Makefile
View File

@ -1,41 +1,42 @@
############################################################################# #############################################################################
# Makefile for building: samplebrain # Makefile for building: samplebrain.app/Contents/MacOS/samplebrain
# Generated by qmake (2.01a) (Qt 4.8.1) on: Sat Jul 11 18:25:22 2015 # Generated by qmake (2.01a) (Qt 4.8.7) on: Mon Jul 13 17:08:29 2015
# Project: samplebrain.pro # Project: samplebrain.pro
# Template: app # Template: app
# Command: /usr/bin/qmake -o Makefile samplebrain.pro # Command: /opt/local/bin/qmake -o Makefile samplebrain.pro
############################################################################# #############################################################################
####### Compiler, tools and options ####### Compiler, tools and options
CC = gcc CC = /usr/bin/clang
CXX = g++ CXX = /usr/bin/clang++
DEFINES = -DQT_WEBKIT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
CFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) CFLAGS = -pipe -O2 -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.10 -Wall -W $(DEFINES)
CXXFLAGS = -m64 -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) CXXFLAGS = -pipe -O2 -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.10 -Wall -W $(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. 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 = g++ LINK = /usr/bin/clang++
LFLAGS = -m64 -Wl,-O1 LFLAGS = -headerpad_max_install_names -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.10
LIBS = $(SUBLIBS) -L/usr/lib/x86_64-linux-gnu -L.. -lsamplebrain -ljellyfish -lportaudio -lfftw3 -lsndfile -llo -ldl -lm -lQtGui -lQtCore -lpthread 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 cqs AR = ar cq
RANLIB = RANLIB = ranlib -s
QMAKE = /usr/bin/qmake QMAKE = /opt/local/bin/qmake
TAR = tar -cf TAR = tar -cf
COMPRESS = gzip -9f COMPRESS = gzip -9f
COPY = cp -f COPY = cp -f
SED = sed SED = sed
COPY_FILE = $(COPY) COPY_FILE = cp -f
COPY_DIR = $(COPY) -r COPY_DIR = cp -f -R
STRIP = strip STRIP =
INSTALL_FILE = install -m 644 -p INSTALL_FILE = $(COPY_FILE)
INSTALL_DIR = $(COPY_DIR) INSTALL_DIR = $(COPY_DIR)
INSTALL_PROGRAM = install -m 755 -p INSTALL_PROGRAM = $(COPY_FILE)
DEL_FILE = rm -f DEL_FILE = rm -f
SYMLINK = ln -f -s SYMLINK = ln -f -s
DEL_DIR = rmdir DEL_DIR = rmdir
MOVE = mv -f MOVE = mv -f
CHK_DIR_EXISTS= test -d CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p MKDIR = mkdir -p
export MACOSX_DEPLOYMENT_TARGET = 10.10
####### Output directory ####### Output directory
@ -52,34 +53,61 @@ OBJECTS = MainWindow.o \
process_thread.o \ process_thread.o \
qtmain.o \ qtmain.o \
moc_MainWindow.o moc_MainWindow.o
DIST = /usr/share/qt4/mkspecs/common/unix.conf \ DIST = /opt/local/share/qt4/mkspecs/common/unix.conf \
/usr/share/qt4/mkspecs/common/linux.conf \ /opt/local/share/qt4/mkspecs/common/mac.conf \
/usr/share/qt4/mkspecs/common/gcc-base.conf \ /opt/local/share/qt4/mkspecs/common/gcc-base.conf \
/usr/share/qt4/mkspecs/common/gcc-base-unix.conf \ /opt/local/share/qt4/mkspecs/common/gcc-base-macx.conf \
/usr/share/qt4/mkspecs/common/g++-base.conf \ /opt/local/share/qt4/mkspecs/common/g++-base.conf \
/usr/share/qt4/mkspecs/common/g++-unix.conf \ /opt/local/share/qt4/mkspecs/common/g++-macx.conf \
/usr/share/qt4/mkspecs/qconfig.pri \ /opt/local/share/qt4/mkspecs/qconfig.pri \
/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ /opt/local/share/qt4/mkspecs/modules/qt_webkit_version.pri \
/usr/share/qt4/mkspecs/features/qt_functions.prf \ /opt/local/share/qt4/mkspecs/features/qt_functions.prf \
/usr/share/qt4/mkspecs/features/qt_config.prf \ /opt/local/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ /opt/local/share/qt4/mkspecs/features/exclusive_builds.prf \
/usr/share/qt4/mkspecs/features/default_pre.prf \ /opt/local/share/qt4/mkspecs/features/default_pre.prf \
/usr/share/qt4/mkspecs/features/release.prf \ /opt/local/share/qt4/mkspecs/features/mac/default_pre.prf \
/usr/share/qt4/mkspecs/features/default_post.prf \ /opt/local/share/qt4/mkspecs/features/release.prf \
/usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ /opt/local/share/qt4/mkspecs/features/default_post.prf \
/usr/share/qt4/mkspecs/features/warn_on.prf \ /opt/local/share/qt4/mkspecs/features/mac/default_post.prf \
/usr/share/qt4/mkspecs/features/qt.prf \ /opt/local/share/qt4/mkspecs/features/mac/x86_64.prf \
/usr/share/qt4/mkspecs/features/unix/thread.prf \ /opt/local/share/qt4/mkspecs/features/mac/objective_cxx.prf \
/usr/share/qt4/mkspecs/features/moc.prf \ /opt/local/share/qt4/mkspecs/features/mac/objective_c.prf \
/usr/share/qt4/mkspecs/features/resources.prf \ /opt/local/share/qt4/mkspecs/features/mac/split_sources.prf \
/usr/share/qt4/mkspecs/features/uic.prf \ /opt/local/share/qt4/mkspecs/features/shared.prf \
/usr/share/qt4/mkspecs/features/yacc.prf \ /opt/local/share/qt4/mkspecs/features/warn_on.prf \
/usr/share/qt4/mkspecs/features/lex.prf \ /opt/local/share/qt4/mkspecs/features/qt.prf \
/usr/share/qt4/mkspecs/features/include_source_dir.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 samplebrain.pro
QMAKE_TARGET = samplebrain QMAKE_TARGET = samplebrain
DESTDIR = 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 first: all
####### Implicit rules ####### Implicit rules
@ -103,67 +131,96 @@ first: all
####### Build rules ####### 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) $(TARGET): $(OBJECTS)
@$(CHK_DIR_EXISTS) samplebrain.app/Contents/MacOS/ || $(MKDIR) samplebrain.app/Contents/MacOS/
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(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 \ Makefile: samplebrain.pro /opt/local/share/qt4/mkspecs/macx-g++/qmake.conf /opt/local/share/qt4/mkspecs/common/unix.conf \
/usr/share/qt4/mkspecs/common/linux.conf \ /opt/local/share/qt4/mkspecs/common/mac.conf \
/usr/share/qt4/mkspecs/common/gcc-base.conf \ /opt/local/share/qt4/mkspecs/common/gcc-base.conf \
/usr/share/qt4/mkspecs/common/gcc-base-unix.conf \ /opt/local/share/qt4/mkspecs/common/gcc-base-macx.conf \
/usr/share/qt4/mkspecs/common/g++-base.conf \ /opt/local/share/qt4/mkspecs/common/g++-base.conf \
/usr/share/qt4/mkspecs/common/g++-unix.conf \ /opt/local/share/qt4/mkspecs/common/g++-macx.conf \
/usr/share/qt4/mkspecs/qconfig.pri \ /opt/local/share/qt4/mkspecs/qconfig.pri \
/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ /opt/local/share/qt4/mkspecs/modules/qt_webkit_version.pri \
/usr/share/qt4/mkspecs/features/qt_functions.prf \ /opt/local/share/qt4/mkspecs/features/qt_functions.prf \
/usr/share/qt4/mkspecs/features/qt_config.prf \ /opt/local/share/qt4/mkspecs/features/qt_config.prf \
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ /opt/local/share/qt4/mkspecs/features/exclusive_builds.prf \
/usr/share/qt4/mkspecs/features/default_pre.prf \ /opt/local/share/qt4/mkspecs/features/default_pre.prf \
/usr/share/qt4/mkspecs/features/release.prf \ /opt/local/share/qt4/mkspecs/features/mac/default_pre.prf \
/usr/share/qt4/mkspecs/features/default_post.prf \ /opt/local/share/qt4/mkspecs/features/release.prf \
/usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \ /opt/local/share/qt4/mkspecs/features/default_post.prf \
/usr/share/qt4/mkspecs/features/warn_on.prf \ /opt/local/share/qt4/mkspecs/features/mac/default_post.prf \
/usr/share/qt4/mkspecs/features/qt.prf \ /opt/local/share/qt4/mkspecs/features/mac/x86_64.prf \
/usr/share/qt4/mkspecs/features/unix/thread.prf \ /opt/local/share/qt4/mkspecs/features/mac/objective_cxx.prf \
/usr/share/qt4/mkspecs/features/moc.prf \ /opt/local/share/qt4/mkspecs/features/mac/objective_c.prf \
/usr/share/qt4/mkspecs/features/resources.prf \ /opt/local/share/qt4/mkspecs/features/mac/split_sources.prf \
/usr/share/qt4/mkspecs/features/uic.prf \ /opt/local/share/qt4/mkspecs/features/shared.prf \
/usr/share/qt4/mkspecs/features/yacc.prf \ /opt/local/share/qt4/mkspecs/features/warn_on.prf \
/usr/share/qt4/mkspecs/features/lex.prf \ /opt/local/share/qt4/mkspecs/features/qt.prf \
/usr/share/qt4/mkspecs/features/include_source_dir.prf \ /opt/local/share/qt4/mkspecs/features/unix/thread.prf \
/usr/lib/x86_64-linux-gnu/libQtGui.prl \ /opt/local/share/qt4/mkspecs/features/moc.prf \
/usr/lib/x86_64-linux-gnu/libQtCore.prl /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 $(QMAKE) -o Makefile samplebrain.pro
/usr/share/qt4/mkspecs/common/unix.conf: /opt/local/share/qt4/mkspecs/common/unix.conf:
/usr/share/qt4/mkspecs/common/linux.conf: /opt/local/share/qt4/mkspecs/common/mac.conf:
/usr/share/qt4/mkspecs/common/gcc-base.conf: /opt/local/share/qt4/mkspecs/common/gcc-base.conf:
/usr/share/qt4/mkspecs/common/gcc-base-unix.conf: /opt/local/share/qt4/mkspecs/common/gcc-base-macx.conf:
/usr/share/qt4/mkspecs/common/g++-base.conf: /opt/local/share/qt4/mkspecs/common/g++-base.conf:
/usr/share/qt4/mkspecs/common/g++-unix.conf: /opt/local/share/qt4/mkspecs/common/g++-macx.conf:
/usr/share/qt4/mkspecs/qconfig.pri: /opt/local/share/qt4/mkspecs/qconfig.pri:
/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri: /opt/local/share/qt4/mkspecs/modules/qt_webkit_version.pri:
/usr/share/qt4/mkspecs/features/qt_functions.prf: /opt/local/share/qt4/mkspecs/features/qt_functions.prf:
/usr/share/qt4/mkspecs/features/qt_config.prf: /opt/local/share/qt4/mkspecs/features/qt_config.prf:
/usr/share/qt4/mkspecs/features/exclusive_builds.prf: /opt/local/share/qt4/mkspecs/features/exclusive_builds.prf:
/usr/share/qt4/mkspecs/features/default_pre.prf: /opt/local/share/qt4/mkspecs/features/default_pre.prf:
/usr/share/qt4/mkspecs/features/release.prf: /opt/local/share/qt4/mkspecs/features/mac/default_pre.prf:
/usr/share/qt4/mkspecs/features/default_post.prf: /opt/local/share/qt4/mkspecs/features/release.prf:
/usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf: /opt/local/share/qt4/mkspecs/features/default_post.prf:
/usr/share/qt4/mkspecs/features/warn_on.prf: /opt/local/share/qt4/mkspecs/features/mac/default_post.prf:
/usr/share/qt4/mkspecs/features/qt.prf: /opt/local/share/qt4/mkspecs/features/mac/x86_64.prf:
/usr/share/qt4/mkspecs/features/unix/thread.prf: /opt/local/share/qt4/mkspecs/features/mac/objective_cxx.prf:
/usr/share/qt4/mkspecs/features/moc.prf: /opt/local/share/qt4/mkspecs/features/mac/objective_c.prf:
/usr/share/qt4/mkspecs/features/resources.prf: /opt/local/share/qt4/mkspecs/features/mac/split_sources.prf:
/usr/share/qt4/mkspecs/features/uic.prf: /opt/local/share/qt4/mkspecs/features/shared.prf:
/usr/share/qt4/mkspecs/features/yacc.prf: /opt/local/share/qt4/mkspecs/features/warn_on.prf:
/usr/share/qt4/mkspecs/features/lex.prf: /opt/local/share/qt4/mkspecs/features/qt.prf:
/usr/share/qt4/mkspecs/features/include_source_dir.prf: /opt/local/share/qt4/mkspecs/features/unix/thread.prf:
/usr/lib/x86_64-linux-gnu/libQtGui.prl: /opt/local/share/qt4/mkspecs/features/moc.prf:
/usr/lib/x86_64-linux-gnu/libQtCore.prl: /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: FORCE
@$(QMAKE) -o Makefile samplebrain.pro @$(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: dist:
@$(CHK_DIR_EXISTS) .tmp/samplebrain1.0.0 || $(MKDIR) .tmp/samplebrain1.0.0 @$(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 $(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 ####### Sub-libraries
distclean: clean distclean: clean
-$(DEL_FILE) $(TARGET) -$(DEL_FILE) -r samplebrain.app
-$(DEL_FILE) Makefile -$(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 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_make_all: moc_MainWindow.cpp
compiler_moc_header_clean: compiler_moc_header_clean:
-$(DEL_FILE) moc_MainWindow.cpp -$(DEL_FILE) moc_MainWindow.cpp
moc_MainWindow.cpp: generated/ui_samplebrain.h \ moc_MainWindow.cpp: generated/ui_samplebrain.h \
MainWindow.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_make_all:
compiler_rcc_clean: compiler_rcc_clean:
@ -201,6 +262,8 @@ compiler_image_collection_clean:
-$(DEL_FILE) qmake_image_collection.cpp -$(DEL_FILE) qmake_image_collection.cpp
compiler_moc_source_make_all: compiler_moc_source_make_all:
compiler_moc_source_clean: compiler_moc_source_clean:
compiler_rez_source_make_all:
compiler_rez_source_clean:
compiler_uic_make_all: compiler_uic_make_all:
compiler_uic_clean: compiler_uic_clean:
compiler_yacc_decl_make_all: compiler_yacc_decl_make_all:

12
samplebrain/qt/audio_thread.cpp
View File

@ -26,10 +26,11 @@ void audio_thread::start_audio() {
void audio_thread::run_audio(void* c, unsigned int frames) { void audio_thread::run_audio(void* c, unsigned int frames) {
audio_thread *at = (audio_thread*)c; audio_thread *at = (audio_thread*)c;
at->m_audio_device->left_out.zero(); 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; command_ring_buffer::command cmd;
while (m_osc.get(cmd)) { while (m_osc.get(cmd)) {
@ -58,13 +59,18 @@ void audio_thread::process(sample &s) {
} }
if (name=="/restart_audio") { if (name=="/restart_audio") {
start_audio(); start_audio();
} }
if (name=="/volume") {
m_renderer->set_volume(cmd.get_float(0)*10);
}
} }
s.zero(); s.zero();
s2.zero();
if (!pthread_mutex_trylock(m_brain_mutex)) { if (!pthread_mutex_trylock(m_brain_mutex)) {
m_renderer->process(s.get_length(),s.get_non_const_buffer()); m_renderer->process(s.get_length(),s.get_non_const_buffer());
pthread_mutex_unlock(m_brain_mutex); pthread_mutex_unlock(m_brain_mutex);
s2=s;
} else { } else {
cerr<<"audio no lock..."<<endl; cerr<<"audio no lock..."<<endl;
} }

2
samplebrain/qt/audio_thread.h
View File

@ -10,7 +10,7 @@ namespace spiralcore {
class audio_thread { class audio_thread {
public: public:
audio_thread(process_thread &p); audio_thread(process_thread &p);
void process(sample &s); void process(sample &left, sample &right);
static void run_audio(void* c, unsigned int frames); static void run_audio(void* c, unsigned int frames);
audio_device *m_audio_device; audio_device *m_audio_device;

1
samplebrain/qt/process_thread.cpp
View File

@ -1,5 +1,6 @@
#include "process_thread.h" #include "process_thread.h"
#include <iostream> #include <iostream>
#include <unistd.h>
using namespace spiralcore; using namespace spiralcore;
using namespace std; using namespace std;

2
samplebrain/src/aquila/filter/MelFilter.dep
View File

@ -1,2 +1,2 @@
MelFilter.o: src/aquila/filter/MelFilter.cpp \ 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

4
samplebrain/src/aquila/filter/MelFilterBank.dep
View File

@ -1,3 +1,3 @@
MelFilterBank.o: src/aquila/filter/MelFilterBank.cpp \ MelFilterBank.o: src/aquila/filter/MelFilterBank.cpp \
src/aquila/filter/MelFilterBank.h src/aquila/filter/../global.h \ src/aquila/filter/MelFilterBank.h src/aquila/filter/../global.h \
src/aquila/filter/MelFilter.h src/aquila/filter/MelFilter.h

2
samplebrain/src/aquila/transform/Dct.dep
View File

@ -1,2 +1,2 @@
Dct.o: src/aquila/transform/Dct.cpp src/aquila/transform/Dct.h \ Dct.o: src/aquila/transform/Dct.cpp src/aquila/transform/Dct.h \
src/aquila/transform/../global.h src/aquila/transform/../global.h