summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 20:40:26 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:43:17 +0100
commit232b8de095b0ad493f7aa83e900e861bcb11f52a (patch)
treec8067421b8aca7ce1d0d7a2c93271b6505d3a035
parentd9b5652cacb12600fa58dc2076b9fe1279ea01a9 (diff)
downloadmpv-232b8de095b0ad493f7aa83e900e861bcb11f52a.tar.bz2
mpv-232b8de095b0ad493f7aa83e900e861bcb11f52a.tar.xz
af_export: require filename argument
Since mp_find_user_config_file() is going to get a context argument, which would be annoying to do in the audio chain (actually I'm just lazy).
-rw-r--r--DOCS/man/en/af.rst4
-rw-r--r--audio/filter/af_export.c7
2 files changed, 5 insertions, 6 deletions
diff --git a/DOCS/man/en/af.rst b/DOCS/man/en/af.rst
index 52d2f7b478..e8b0e4adbd 100644
--- a/DOCS/man/en/af.rst
+++ b/DOCS/man/en/af.rst
@@ -422,7 +422,7 @@ Available filters are:
Would delay front left and right by 10.5ms, the two rear channels
and the subwoofer by 0ms and the center channel by 7ms.
-``export[=mmapped_file[:nsamples]]``
+``export=mmapped_file:nsamples]``
Exports the incoming signal to other processes using memory mapping
(``mmap()``). Memory mapped areas contain a header::
@@ -434,7 +434,7 @@ Available filters are:
The rest is payload (non-interleaved) 16-bit data.
``<mmapped_file>``
- File to map data to (default: ``~/.mpv/mpv-af_export``).
+ File to map data to (required)
``<nsamples>``
number of samples per channel (default: 512).
diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c
index 3af8316cbe..a5a8257c39 100644
--- a/audio/filter/af_export.c
+++ b/audio/filter/af_export.c
@@ -213,11 +213,10 @@ static int af_open( struct af_instance* af )
af->filter = filter;
af_export_t *priv = af->priv;
- if (!priv->filename || !priv->filename[0])
- priv->filename = mp_find_user_config_file(SHARED_FILE);
-
- if (!priv->filename || !priv->filename[0])
+ if (!priv->filename || !priv->filename[0]) {
+ MP_FATAL(af, "no export filename given");
return AF_ERROR;
+ }
return AF_OK;
}