Ticket #47189: patch-fix-audiounits.diff

File patch-fix-audiounits.diff, 8.1 KB (added by RJVB (René Bertin), 9 years ago)

  • src/effects/audiounits/AUControl.mm 

    diff --git a/src/effects/audiounits/AUControl.mm b/src/effects/audiounits/AUControl.mm
index 9296318..52cc77b 100644
    a b bool AUControl::Create(wxWindow *parent, AudioComponent comp, AudioUnit unit, bo 
    163163#endif
    164164   }
    165165
    166    if (!mView && !mHIView)
     166   if (!mView
     167#if !defined(_LP64)
     168    && !mHIView
     169#endif
     170   )
    167171   {
    168172      CreateGeneric();
    169173   }
    170174
    171    if (!mView && !mHIView)
     175   if (!mView
     176#if !defined(_LP64)
     177    && !mHIView
     178#endif
     179   )
    172180   {
    173181      return false;
    174182   }
    175183
    176184   SetPeer(new AUControlImpl(this, mAUView));
    177185
     186#if !defined(_LP64)
    178187   if (mHIView)
    179188   {
    180189      CreateCarbonOverlay();
    181190   }
     191#endif
    182192
    183193   // Must get the size again since SetPeer() could cause it to change
    184194   SetInitialSize(GetMinSize());

  • configure 

    diff --git a/configure b/configure
index 8904ff9..e78dbf3 100755
    a b esac 
    2359523595case "${host_os}" in
    2359623596   darwin* | rhapsody*)
    2359723597      LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
    23598       LIBS="-framework CoreAudio $LIBS -lz"
     23598      LIBS="-framework CoreAudio -framework CoreAudioKit $LIBS -lz"
    2359923599      ;;
    2360023600   cygwin*)
    2360123601      ;;

  • src/Makefile.am 

    diff --git a/src/Makefile.am b/src/Makefile.am
index aab9208..1fda424 100644
    a b audacity_LDADD += $(AUDIOUNITS_LIBS) 
    574575audacity_SOURCES += \
    575576        effects/audiounits/AudioUnitEffect.cpp \
    576577        effects/audiounits/AudioUnitEffect.h \
     578        effects/audiounits/AUControl.mm \
     579        effects/audiounits/AUControl.h \
    577580        $(NULL)
    578581endif
    579582

  • src/Makefile.in 

    diff --git a/src/Makefile.in b/src/Makefile.in
index e5becb0..e7ab5e6 100644
    a b bin_PROGRAMS = audacity$(EXEEXT) 
    9595@USE_AUDIO_UNITS_TRUE@am__append_3 = \
    9696@USE_AUDIO_UNITS_TRUE@  effects/audiounits/AudioUnitEffect.cpp \
    9797@USE_AUDIO_UNITS_TRUE@  effects/audiounits/AudioUnitEffect.h \
     98@USE_AUDIO_UNITS_TRUE@  effects/audiounits/AUControl.mm \
     99@USE_AUDIO_UNITS_TRUE@  effects/audiounits/AUControl.h \
    98100@USE_AUDIO_UNITS_TRUE@  $(NULL)
    99101
    100102@USE_FFMPEG_TRUE@am__append_4 = $(FFMPEG_CFLAGS)
    … … am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ 
    467469        widgets/valnum.h widgets/Warning.cpp widgets/Warning.h \
    468470        xml/XMLFileReader.cpp xml/XMLFileReader.h xml/XMLWriter.cpp \
    469471        xml/XMLWriter.h effects/audiounits/AudioUnitEffect.cpp \
    470         effects/audiounits/AudioUnitEffect.h export/ExportFFmpeg.cpp \
     472        effects/audiounits/AudioUnitEffect.h effects/audiounits/AUControl.mm \
     473        effects/audiounits/AUControl.h export/ExportFFmpeg.cpp \
    471474        export/ExportFFmpeg.h export/ExportFFmpegDialogs.cpp \
    472475        export/ExportFFmpegDialogs.h import/ImportFFmpeg.cpp \
    473476        import/ImportFFmpeg.h import/ImportGStreamer.cpp \
    … … am__objects_1 = audacity-BlockFile.$(OBJEXT) \ 
    498501        blockfile/audacity-SilentBlockFile.$(OBJEXT) \
    499502        blockfile/audacity-SimpleBlockFile.$(OBJEXT) \
    500503        xml/audacity-XMLTagHandler.$(OBJEXT)
    501 @USE_AUDIO_UNITS_TRUE@am__objects_2 = effects/audiounits/audacity-AudioUnitEffect.$(OBJEXT)
     504@USE_AUDIO_UNITS_TRUE@am__objects_2 = effects/audiounits/audacity-AudioUnitEffect.$(OBJEXT) \
     505@USE_AUDIO_UNITS_TRUE@    effects/audiounits/audacity-AUControl.$(OBJEXT)
    502506@USE_FFMPEG_TRUE@am__objects_3 =  \
    503507@USE_FFMPEG_TRUE@       export/audacity-ExportFFmpeg.$(OBJEXT) \
    504508@USE_FFMPEG_TRUE@       export/audacity-ExportFFmpegDialogs.$(OBJEXT) \
    … … effects/audiounits/$(DEPDIR)/$(am__dirstamp): 
    18861891effects/audiounits/audacity-AudioUnitEffect.$(OBJEXT):  \
    18871892        effects/audiounits/$(am__dirstamp) \
    18881893        effects/audiounits/$(DEPDIR)/$(am__dirstamp)
     1894effects/audiounits/audacity-AUControl.$(OBJEXT):  \
     1895        effects/audiounits/$(am__dirstamp) \
     1896        effects/audiounits/$(DEPDIR)/$(am__dirstamp)
    18891897export/audacity-ExportFFmpeg.$(OBJEXT): export/$(am__dirstamp) \
    18901898        export/$(DEPDIR)/$(am__dirstamp)
    18911899export/audacity-ExportFFmpegDialogs.$(OBJEXT): export/$(am__dirstamp) \
    … … distclean-compile: 
    21582166@AMDEP_TRUE@@am__include@ @am__quote@effects/$(DEPDIR)/audacity-Wahwah.Po@am__quote@
    21592167@AMDEP_TRUE@@am__include@ @am__quote@effects/VST/$(DEPDIR)/audacity-VSTControlGTK.Po@am__quote@
    21602168@AMDEP_TRUE@@am__include@ @am__quote@effects/VST/$(DEPDIR)/audacity-VSTEffect.Po@am__quote@
     2169@AMDEP_TRUE@@am__include@ @am__quote@effects/audiounits/$(DEPDIR)/audacity-AUControl.Po@am__quote@
    21612170@AMDEP_TRUE@@am__include@ @am__quote@effects/audiounits/$(DEPDIR)/audacity-AudioUnitEffect.Po@am__quote@
    21622171@AMDEP_TRUE@@am__include@ @am__quote@effects/ladspa/$(DEPDIR)/audacity-LadspaEffect.Po@am__quote@
    21632172@AMDEP_TRUE@@am__include@ @am__quote@effects/lv2/$(DEPDIR)/audacity-LV2Effect.Po@am__quote@
    … … effects/audiounits/audacity-AudioUnitEffect.obj: effects/audiounits/AudioUnitEff 
    58135822@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    58145823@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/audiounits/audacity-AudioUnitEffect.obj `if test -f 'effects/audiounits/AudioUnitEffect.cpp'; then $(CYGPATH_W) 'effects/audiounits/AudioUnitEffect.cpp'; else $(CYGPATH_W) '$(srcdir)/effects/audiounits/AudioUnitEffect.cpp'; fi`
    58155824
     5825effects/audiounits/audacity-AUControl.o: effects/audiounits/AUControl.mm
     5826@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT effects/audiounits/audacity-AUControl.o -MD -MP -MF effects/audiounits/$(DEPDIR)/audacity-AUControl.Tpo -c -o effects/audiounits/audacity-AUControl.o `test -f 'effects/audiounits/AUControl.mm' || echo '$(srcdir)/'`effects/audiounits/AUControl.mm
     5827@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) effects/audiounits/$(DEPDIR)/audacity-AUControl.Tpo effects/audiounits/$(DEPDIR)/audacity-AUControl.Po
     5828@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='effects/audiounits/AUControl.mm' object='effects/audiounits/audacity-AUControl.o' libtool=no @AMDEPBACKSLASH@
     5829@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     5830@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/audiounits/audacity-AUControl.o `test -f 'effects/audiounits/AUControl.mm' || echo '$(srcdir)/'`effects/audiounits/AUControl.mm
     5831
     5832effects/audiounits/audacity-AUControl.obj: effects/audiounits/AUControl.mm
     5833@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT effects/audiounits/audacity-AUControl.obj -MD -MP -MF effects/audiounits/$(DEPDIR)/audacity-AUControl.Tpo -c -o effects/audiounits/audacity-AUControl.obj `if test -f 'effects/audiounits/AUControl.mm'; then $(CYGPATH_W) 'effects/audiounits/AUControl.mm'; else $(CYGPATH_W) '$(srcdir)/effects/audiounits/AUControl.mm'; fi`
     5834@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) effects/audiounits/$(DEPDIR)/audacity-AUControl.Tpo effects/audiounits/$(DEPDIR)/audacity-AUControl.Po
     5835@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='effects/audiounits/AUControl.mm' object='effects/audiounits/audacity-AUControl.obj' libtool=no @AMDEPBACKSLASH@
     5836@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     5837@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o effects/audiounits/audacity-AUControl.obj `if test -f 'effects/audiounits/AUControl.mm'; then $(CYGPATH_W) 'effects/audiounits/AUControl.mm'; else $(CYGPATH_W) '$(srcdir)/effects/audiounits/AUControl.mm'; fi`
     5838
    58165839export/audacity-ExportFFmpeg.o: export/ExportFFmpeg.cpp
    58175840@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT export/audacity-ExportFFmpeg.o -MD -MP -MF export/$(DEPDIR)/audacity-ExportFFmpeg.Tpo -c -o export/audacity-ExportFFmpeg.o `test -f 'export/ExportFFmpeg.cpp' || echo '$(srcdir)/'`export/ExportFFmpeg.cpp
    58185841@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) export/$(DEPDIR)/audacity-ExportFFmpeg.Tpo export/$(DEPDIR)/audacity-ExportFFmpeg.Po