From e0c55cbfea2180f66d9d8570f975e773a5469986 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 1 Aug 2015 21:20:55 +0200 Subject: audio: remove af_dummy Was used internally once; has no function anymore. --- TOOLS/old-makefile | 1 - audio/filter/af.c | 2 -- audio/filter/af_dummy.c | 61 ------------------------------------------------- wscript_build.py | 1 - 4 files changed, 65 deletions(-) delete mode 100644 audio/filter/af_dummy.c diff --git a/TOOLS/old-makefile b/TOOLS/old-makefile index 9942fb84ab..940233d581 100644 --- a/TOOLS/old-makefile +++ b/TOOLS/old-makefile @@ -124,7 +124,6 @@ SOURCES = audio/audio.c \ audio/filter/af_center.c \ audio/filter/af_channels.c \ audio/filter/af_delay.c \ - audio/filter/af_dummy.c \ audio/filter/af_equalizer.c \ audio/filter/af_export.c \ audio/filter/af_extrastereo.c \ diff --git a/audio/filter/af.c b/audio/filter/af.c index bccdcefde0..6a5b1f42a5 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -31,7 +31,6 @@ #include "af.h" // Static list of filters -extern const struct af_info af_info_dummy; extern const struct af_info af_info_delay; extern const struct af_info af_info_channels; extern const struct af_info af_info_format; @@ -58,7 +57,6 @@ extern const struct af_info af_info_lavfi; extern const struct af_info af_info_rubberband; static const struct af_info *const filter_list[] = { - &af_info_dummy, &af_info_delay, &af_info_channels, &af_info_format, diff --git a/audio/filter/af_dummy.c b/audio/filter/af_dummy.c deleted file mode 100644 index 341ec7e3cb..0000000000 --- a/audio/filter/af_dummy.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * The name speaks for itself. This filter is a dummy and will - * not blow up regardless of what you do with it. - * - * Original author: Anders - * - * This file is part of mpv. - * - * mpv 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. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . - */ - -#include -#include -#include - -#include "af.h" - -// Initialization and runtime control -static int control(struct af_instance* af, int cmd, void* arg) -{ - switch(cmd){ - case AF_CONTROL_REINIT: ; - *af->data = *(struct mp_audio*)arg; - MP_VERBOSE(af, "Was reinitialized: %iHz/%ich/%s\n", - af->data->rate,af->data->nch,af_fmt_to_str(af->data->format)); - return AF_OK; - } - return AF_UNKNOWN; -} - -// Filter data through filter -static int filter(struct af_instance* af, struct mp_audio* data) -{ - af_add_output_frame(af, data); - return 0; -} - -// Allocate memory and set function pointers -static int af_open(struct af_instance* af){ - af->control=control; - af->filter_frame=filter; - return AF_OK; -} - -// Description of this filter -const struct af_info af_info_dummy = { - .info = "dummy", - .name = "dummy", - .open = af_open, -}; diff --git a/wscript_build.py b/wscript_build.py index 4c973c1b29..bca626dd63 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -105,7 +105,6 @@ def build(ctx): ( "audio/filter/af_channels.c" ), ( "audio/filter/af_delay.c" ), ( "audio/filter/af_drc.c" ), - ( "audio/filter/af_dummy.c" ), ( "audio/filter/af_equalizer.c" ), ( "audio/filter/af_export.c" ), ( "audio/filter/af_extrastereo.c" ), -- cgit v1.2.3