summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Grandin <grandinp@gmail.com>2017-05-08 13:34:10 -0700
committerPierre Grandin <grandinp@gmail.com>2017-05-08 13:34:10 -0700
commitf1c1b72912ce0ff081dce3cfd917aa5b73bf7d8c (patch)
tree15210657971a3b9268156a8636dfb939ffe04405
parenta1df401d5a04fd16a2404227b24d599caab00b4d (diff)
downloadnavit-audio_framework.tar.gz
Removed player-stub dependencies upon alsaaudio_framework
-rw-r--r--navit/audio/player-stub/stub.c4
-rw-r--r--navit/audio/player-stub/stub.h59
2 files changed, 0 insertions, 63 deletions
diff --git a/navit/audio/player-stub/stub.c b/navit/audio/player-stub/stub.c
index d31d291d3..34b634888 100644
--- a/navit/audio/player-stub/stub.c
+++ b/navit/audio/player-stub/stub.c
@@ -58,9 +58,6 @@
#include <navit/callback.h>
#include <navit/event.h>
#include <navit/audio.h>
-#include "graphics.h"
-#include "color.h"
-#include "stub.h"
#define max(x, y) (((x) > (y)) ? (x) : (y))
#define min(x, y) (((x) < (y)) ? (x) : (y))
@@ -70,7 +67,6 @@
/// Index to the next track
static int g_track_index;
-static audio_fifo_t g_audiofifo;
char str[25]; // this string is just for visualisation of the functions
char track[64];
diff --git a/navit/audio/player-stub/stub.h b/navit/audio/player-stub/stub.h
deleted file mode 100644
index 003255d66..000000000
--- a/navit/audio/player-stub/stub.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Spotify Ltd
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *
- * Audio output driver.
- *
- * This file is part of the libspotify examples suite.
- */
-#ifndef _STUB_AUDIO_H_
-#define _STUB_AUDIO_H_
-
-#include <pthread.h>
-#include <stdint.h>
-#include <glib.h>
-#include "queue.h"
-
-
-/* --- Types --- */
-typedef struct audio_fifo_data {
- TAILQ_ENTRY(audio_fifo_data) link;
- int channels;
- int rate;
- int nsamples;
- int16_t samples[0];
-} audio_fifo_data_t;
-
-typedef struct audio_fifo {
- TAILQ_HEAD(, audio_fifo_data) q;
- int qlen;
- pthread_mutex_t mutex;
- pthread_cond_t cond;
-} audio_fifo_t;
-
-
-/* --- Functions --- */
-extern void audio_init(audio_fifo_t *af);
-extern void audio_fifo_flush(audio_fifo_t *af);
-audio_fifo_data_t* audio_get(audio_fifo_t *af);
-
-
-#endif /* _STUB_AUDIO_H_ */