[SCM] rubberband/master: Really resolve merge
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Mon Sep 24 16:15:21 UTC 2012
The following commit has been merged in the master branch:
commit 8baa9f0034d8b3310ba444ee2a644bb44ff81141
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Mon Sep 24 18:11:49 2012 +0200
Really resolve merge
diff --git a/Makefile.in b/Makefile.in
index bd4a2d4..5107b5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,13 +2,12 @@
CXX := @CXX@
CXXFLAGS := -DHAVE_LIBSAMPLERATE -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS -DNO_TIMING -DNDEBUG @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -I. -Isrc $(OPTFLAGS)
CFLAGS := @CFLAGS@ $(OPTFLAGS)
-LDFLAGS := @LDFLAGS@ $(LDFLAGS)
+LDFLAGS := @LDFLAGS@ -lpthread $(LDFLAGS)
-LIBRARY_LIBS := @SRC_LIBS@ @FFTW_LIBS@ -lpthread
-SELF_LIBS := -Llib -lrubberband
-PROGRAM_LIBS := @SNDFILE_LIBS@ $(SELF_LIBS)
-VAMP_PLUGIN_LIBS := @Vamp_LIBS@ $(SELF_LIBS)
-LADSPA_PLUGIN_LIBS := $(SELF_LIBS)
+LIBRARY_LIBS := @SRC_LIBS@ @FFTW_LIBS@
+PROGRAM_LIBS := @SNDFILE_LIBS@ $(LIBRARY_LIBS)
+VAMP_PLUGIN_LIBS := @Vamp_LIBS@ $(LIBRARY_LIBS)
+LADSPA_PLUGIN_LIBS := $(LIBRARY_LIBS)
MKDIR := mkdir
AR := ar
@@ -118,20 +117,20 @@ PROGRAM_OBJECTS := $(PROGRAM_SOURCES:.cpp=.o)
VAMP_OBJECTS := $(VAMP_SOURCES:.cpp=.o)
LADSPA_OBJECTS := $(LADSPA_SOURCES:.cpp=.o)
-$(PROGRAM_TARGET): $(DYNAMIC_TARGET) $(PROGRAM_OBJECTS)
- $(CXX) -o $@ $(PROGRAM_OBJECTS) $(PROGRAM_LIBS) $(LDFLAGS)
+$(PROGRAM_TARGET): $(LIBRARY_OBJECTS) $(PROGRAM_OBJECTS)
+ $(CXX) -o $@ $^ $(PROGRAM_LIBS) $(LDFLAGS)
$(STATIC_TARGET): $(LIBRARY_OBJECTS)
$(AR) rsc $@ $^
$(DYNAMIC_TARGET): $(LIBRARY_OBJECTS)
- $(CXX) $(DYNAMIC_LDFLAGS) $^ -o $@ $(LIBRARY_LIBS) $(LIBRARY_LDFLAGS) $(LDFLAGS)
+ $(CXX) $(DYNAMIC_LDFLAGS) $^ -o $@ $(LIBRARY_LIBS) $(LDFLAGS)
-$(VAMP_TARGET): $(DYNAMIC_TARGET) $(VAMP_OBJECTS)
- $(CXX) $(VAMP_LDFLAGS) -o $@ $(VAMP_OBJECTS) $(VAMP_PLUGIN_LIBS) $(LDFLAGS)
+$(VAMP_TARGET): $(LIBRARY_OBJECTS) $(VAMP_OBJECTS)
+ $(CXX) $(VAMP_LDFLAGS) -o $@ $^ $(VAMP_PLUGIN_LIBS) $(LDFLAGS)
-$(LADSPA_TARGET): $(DYNAMIC_TARGET) $(LADSPA_OBJECTS)
- $(CXX) $(LADSPA_LDFLAGS) -o $@ $(LADSPA_OBJECTS) $(LADSPA_PLUGIN_LIBS) $(LDFLAGS)
+$(LADSPA_TARGET): $(LIBRARY_OBJECTS) $(LADSPA_OBJECTS)
+ $(CXX) $(LADSPA_LDFLAGS) -o $@ $^ $(LADSPA_PLUGIN_LIBS) $(LDFLAGS)
bin:
$(MKDIR) $@
diff --git a/main/main.cpp b/main/main.cpp
index 24c9e3e..c977423 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -20,16 +20,11 @@
#include <time.h>
#include <cstdlib>
#include <cstring>
-<<<<<<< HEAD:src/main.cpp
-#include <unistd.h>
-#include "sysutils.h"
-=======
#include <string>
#include <fstream>
#include "system/sysutils.h"
->>>>>>> upstream/1.7.0:main/main.cpp
#include <getopt.h>
#include <unistd.h>
diff --git a/rubberband/RubberBandStretcher.h b/rubberband/RubberBandStretcher.h
index 941e3b7..a1d75a7 100644
--- a/rubberband/RubberBandStretcher.h
+++ b/rubberband/RubberBandStretcher.h
@@ -20,10 +20,7 @@
#define RUBBERBAND_API_MINOR_VERSION 5
#include <vector>
-<<<<<<< HEAD
-=======
#include <map>
->>>>>>> upstream/1.7.0
#include <cstddef>
/**
diff --git a/src/sysutils.cpp b/src/sysutils.cpp
deleted file mode 100644
index b4c4e8c..0000000
--- a/src/sysutils.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
-/*
- Rubber Band
- An audio time-stretching and pitch-shifting library.
- Copyright 2007-2008 Chris Cannam.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
-*/
-
-#include "sysutils.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#else /* !_WIN32 */
-#ifdef __APPLE__
-#include <sys/sysctl.h>
-#else /* !__APPLE__, !_WIN32 */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#endif /* !__APPLE__, !_WIN32 */
-#endif /* !_WIN32 */
-
-#include <cstdlib>
-#include <iostream>
-
-
-namespace RubberBand {
-
-bool
-system_is_multiprocessor()
-{
- static bool tested = false, mp = false;
-
- if (tested) return mp;
- int count = 0;
-
-#ifdef _WIN32
-
- SYSTEM_INFO sysinfo;
- GetSystemInfo(&sysinfo);
- count = sysinfo.dwNumberOfProcessors;
-
-#else /* !_WIN32 */
-#ifdef __APPLE__
-
- size_t sz = sizeof(count);
- if (sysctlbyname("hw.ncpu", &count, &sz, NULL, 0)) {
- mp = false;
- } else {
- mp = (count > 1);
- }
-
-#else /* !__APPLE__, !_WIN32 */
-
- //...
-
- FILE *cpuinfo = fopen("/proc/cpuinfo", "r");
- if (!cpuinfo) return false;
-
- char buf[256];
- while (!feof(cpuinfo)) {
- fgets(buf, 256, cpuinfo);
- if (!strncmp(buf, "processor", 9)) {
- ++count;
- }
- if (count > 1) break;
- }
-
- fclose(cpuinfo);
-
-#endif /* !__APPLE__, !_WIN32 */
-#endif /* !_WIN32 */
-
- mp = (count > 1);
- tested = true;
- return mp;
-}
-
-#ifdef _WIN32
-
-int gettimeofday(struct timeval *tv, void *tz)
-{
- union {
- long long ns100;
- FILETIME ft;
- } now;
-
- ::GetSystemTimeAsFileTime(&now.ft);
- tv->tv_usec = (long)((now.ns100 / 10LL) % 1000000LL);
- tv->tv_sec = (long)((now.ns100 - 116444736000000000LL) / 10000000LL);
- return 0;
-}
-
-void usleep(unsigned long usec)
-{
- ::Sleep(usec == 0 ? 0 : usec < 1000 ? 1 : usec / 1000);
-}
-
-#endif
-
-
-float *allocFloat(float *ptr, int count)
-{
- if (ptr) free((void *)ptr);
- void *allocated;
-#ifndef _WIN32
-#ifndef __APPLE__
- if (posix_memalign(&allocated, 16, count * sizeof(float)))
-#endif
-#endif
- allocated = malloc(count * sizeof(float));
- for (int i = 0; i < count; ++i) ((float *)allocated)[i] = 0.f;
- return (float *)allocated;
-}
-
-float *allocFloat(int count)
-{
- return allocFloat(0, count);
-}
-
-void freeFloat(float *ptr)
-{
- if (ptr) free(ptr);
-}
-
-double *allocDouble(double *ptr, int count)
-{
- if (ptr) free((void *)ptr);
- void *allocated;
-#ifndef _WIN32
-#ifndef __APPLE__
- if (posix_memalign(&allocated, 16, count * sizeof(double)))
-#endif
-#endif
- allocated = malloc(count * sizeof(double));
- for (int i = 0; i < count; ++i) ((double *)allocated)[i] = 0.f;
- return (double *)allocated;
-}
-
-double *allocDouble(int count)
-{
- return allocDouble(0, count);
-}
-
-void freeDouble(double *ptr)
-{
- if (ptr) free(ptr);
-}
-
-
-}
-
-
-
diff --git a/vamp/RubberBandVampPlugin.cpp b/vamp/RubberBandVampPlugin.cpp
index 9942be6..ca1a76a 100644
--- a/vamp/RubberBandVampPlugin.cpp
+++ b/vamp/RubberBandVampPlugin.cpp
@@ -17,7 +17,6 @@
#include "StretchCalculator.h"
#include "system/sysutils.h"
-#include <cstdio>
#include <cmath>
#include <cstdio>
--
rubberband packaging
More information about the pkg-multimedia-commits
mailing list