diff options
| -rw-r--r-- | drumgizmo/output/jackaudio.h | 2 | ||||
| -rw-r--r-- | plugin/Makefile.mingw32.in | 2 | ||||
| -rw-r--r-- | plugingui/Makefile.mingw32 | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/audiocacheeventhandler.h | 2 | ||||
| -rw-r--r-- | src/drumkitloader.h | 2 | ||||
| -rw-r--r-- | src/sem.cc (renamed from src/semaphore.cc) | 7 | ||||
| -rw-r--r-- | src/sem.h (renamed from src/semaphore.h) | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 8 | ||||
| -rw-r--r-- | test/semaphoretest.cc | 2 |
10 files changed, 16 insertions, 17 deletions
diff --git a/drumgizmo/output/jackaudio.h b/drumgizmo/output/jackaudio.h index ce18f6f..52e6213 100644 --- a/drumgizmo/output/jackaudio.h +++ b/drumgizmo/output/jackaudio.h @@ -26,7 +26,7 @@ */ #pragma once #include <vector> -#include <semaphore.h> +#include <sem.h> #include "audiooutputengine.h" #include "../jackclient.h" diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in index 610d5e9..50d6478 100644 --- a/plugin/Makefile.mingw32.in +++ b/plugin/Makefile.mingw32.in @@ -36,7 +36,7 @@ DG_SRC = \ @top_srcdir@/src/random.cc \ @top_srcdir@/src/sample.cc \ @top_srcdir@/src/sample_selection.cc \ - @top_srcdir@/src/semaphore.cc \ + @top_srcdir@/src/sem.cc \ @top_srcdir@/src/staminafilter.cc \ @top_srcdir@/src/thread.cc \ @top_srcdir@/src/velocityfilter.cc \ diff --git a/plugingui/Makefile.mingw32 b/plugingui/Makefile.mingw32 index afc43b8..df735d5 100644 --- a/plugingui/Makefile.mingw32 +++ b/plugingui/Makefile.mingw32 @@ -1,7 +1,7 @@ DG_SRC = \ ../src/configfile.cc \ ../src/thread.cc \ - ../src/semaphore.cc \ + ../src/sem.cc \ ../src/mutex.cc DG_CFLAGS = -I.. -I../src -DSSE -msse -msse2 diff --git a/src/Makefile.am b/src/Makefile.am index dec675d..b85e1d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,7 +38,7 @@ nodist_libdg_la_SOURCES = \ random.cc \ sample.cc \ sample_selection.cc \ - semaphore.cc \ + sem.cc \ staminafilter.cc \ thread.cc \ velocityfilter.cc \ @@ -87,7 +87,7 @@ EXTRA_DIST = \ rangemap.h \ sample.h \ sample_selection.h \ - semaphore.h \ + sem.h \ settings.h \ staminafilter.h \ syncedsettings.h \ diff --git a/src/audiocacheeventhandler.h b/src/audiocacheeventhandler.h index e1e60a9..f80b4c8 100644 --- a/src/audiocacheeventhandler.h +++ b/src/audiocacheeventhandler.h @@ -31,7 +31,7 @@ #include <atomic> #include "thread.h" -#include "semaphore.h" +#include "sem.h" #include "audiocachefile.h" #include "audiocacheidmanager.h" diff --git a/src/drumkitloader.h b/src/drumkitloader.h index e9d18c3..b6e0a8e 100644 --- a/src/drumkitloader.h +++ b/src/drumkitloader.h @@ -32,7 +32,7 @@ #include <vector> #include "thread.h" -#include "semaphore.h" +#include "sem.h" #include "drumkit.h" #include "settings.h" diff --git a/src/semaphore.cc b/src/sem.cc index fdc33f1..ad5266d 100644 --- a/src/semaphore.cc +++ b/src/sem.cc @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /*************************************************************************** - * semaphore.cc + * sem.cc * * Sat Oct 8 17:44:13 CEST 2005 * Copyright 2005 Bent Bisballe Nyeng @@ -24,7 +24,7 @@ * along with DrumGizmo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include "semaphore.h" +#include "sem.h" #include <hugin.hpp> #include <limits> @@ -36,8 +36,7 @@ #include "platform.h" #if DG_PLATFORM != DG_PLATFORM_WINDOWS -// Make sure we don't include /this/ file's header... -#include <../include/semaphore.h> +#include <semaphore.h> #include <errno.h> #include <stdio.h> #include <sys/time.h> diff --git a/src/semaphore.h b/src/sem.h index d5995cb..89f9d73 100644 --- a/src/semaphore.h +++ b/src/sem.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /*************************************************************************** - * semaphore.h + * sem.h * * Sat Oct 8 17:44:13 CEST 2005 * Copyright 2005 Bent Bisballe Nyeng diff --git a/test/Makefile.am b/test/Makefile.am index 80ff73a..056c111 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -44,7 +44,7 @@ audiocache_SOURCES = \ $(top_srcdir)/src/audiocachefile.cc \ $(top_srcdir)/src/audiocacheidmanager.cc \ $(top_srcdir)/src/thread.cc \ - $(top_srcdir)/src/semaphore.cc \ + $(top_srcdir)/src/sem.cc \ $(top_srcdir)/src/audiofile.cc \ $(top_srcdir)/src/random.cc \ dgtest.cc \ @@ -58,7 +58,7 @@ audiocachefile_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS) audiocachefile_SOURCES = \ $(top_srcdir)/src/audiocachefile.cc \ $(top_srcdir)/src/thread.cc \ - $(top_srcdir)/src/semaphore.cc \ + $(top_srcdir)/src/sem.cc \ $(top_srcdir)/src/audiofile.cc \ $(top_srcdir)/src/random.cc \ dgtest.cc \ @@ -85,7 +85,7 @@ audiocacheeventhandler_SOURCES = \ $(top_srcdir)/src/audiocacheidmanager.cc \ $(top_srcdir)/src/audiocachefile.cc \ $(top_srcdir)/src/thread.cc \ - $(top_srcdir)/src/semaphore.cc \ + $(top_srcdir)/src/sem.cc \ dgtest.cc \ audiocacheeventhandlertest.cc @@ -165,7 +165,7 @@ semaphoretest_CXXFLAGS = -DOUTPUT=\"semaphoretest\" \ semaphoretest_LDFLAGS = $(PTHREAD_LIBS) semaphoretest_SOURCES = \ $(top_srcdir)/hugin/hugin.c \ - $(top_srcdir)/src/semaphore.cc \ + $(top_srcdir)/src/sem.cc \ semaphoretest.cc \ dgtest.cc diff --git a/test/semaphoretest.cc b/test/semaphoretest.cc index c99e9a6..470b5a0 100644 --- a/test/semaphoretest.cc +++ b/test/semaphoretest.cc @@ -31,7 +31,7 @@ #include <chrono> #include <iostream> -#include "../src/semaphore.h" +#include "../src/sem.h" std::chrono::nanoseconds dist(const std::chrono::duration<float>& a, const std::chrono::duration<float>& b) |