summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/audiocacheeventhandler.h2
-rw-r--r--src/drumkitloader.h2
-rw-r--r--src/sem.cc (renamed from src/semaphore.cc)7
-rw-r--r--src/sem.h (renamed from src/semaphore.h)2
5 files changed, 8 insertions, 9 deletions
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