Update code to upstream revision r767

Just reorganisation of the audio_processing code.

src/modules/audio_processing/ns/Makefile.am

@@ -1,20 +1,20 @@
 noinst_LTLIBRARIES = libns.la libns_fix.la
 
-libns_la_SOURCES = main/interface/noise_suppression.h \
-		   main/source/noise_suppression.c \
-		   main/source/windows_private.h \
-		   main/source/defines.h \
-		   main/source/ns_core.c \
-		   main/source/ns_core.h
+libns_la_SOURCES = interface/noise_suppression.h \
+		   noise_suppression.c \
+		   windows_private.h \
+		   defines.h \
+		   ns_core.c \
+		   ns_core.h
 libns_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) \
 		  -I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
 		  -I$(top_srcdir)/src/modules/audio_processing/utility
 
-libns_fix_la_SOURCES = main/interface/noise_suppression_x.h \
-		       main/source/noise_suppression_x.c \
-		       main/source/nsx_defines.h \
-		       main/source/nsx_core.c \
-		       main/source/nsx_core.h
+libns_fix_la_SOURCES = interface/noise_suppression_x.h \
+		       noise_suppression_x.c \
+		       nsx_defines.h \
+		       nsx_core.c \
+		       nsx_core.h
 libns_fix_la_CFLAGS = $(AM_CFLAGS) $(COMMON_CFLAGS) \
 		      -I$(top_srcdir)/src/common_audio/signal_processing_library/main/interface \
 		      -I$(top_srcdir)/src/modules/audio_processing/utility

src/modules/audio_processing/ns/ns.gypi

@@ -16,15 +16,15 @@
         'apm_util'
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/noise_suppression.h',
+        'interface/noise_suppression.h',
         'noise_suppression.c',
         'windows_private.h',
         'defines.h',
@@ -39,15 +39,15 @@
         '<(webrtc_root)/common_audio/common_audio.gyp:spl',
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/noise_suppression_x.h',
+        'interface/noise_suppression_x.h',
         'noise_suppression_x.c',
         'nsx_defines.h',
         'nsx_core.c',
@@ -56,9 +56,3 @@
     },
   ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2: