diff options
| author | wm4 <wm4@nowhere> | 2014-02-24 19:35:06 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-02-24 20:50:47 +0100 |
| commit | 1e27d130a2c7d09ae9b9a97c7431f0a1c1d73ea2 (patch) | |
| tree | 1cf63ca938e8a63c7c8e94975f6da35608b85834 /player | |
| parent | 1e30048184930403265cad091863aa0a5d1e9d76 (diff) | |
| download | mpv-1e27d130a2c7d09ae9b9a97c7431f0a1c1d73ea2.tar.bz2 mpv-1e27d130a2c7d09ae9b9a97c7431f0a1c1d73ea2.tar.xz | |
client API: change semantics for MPV_FORMAT_STRING
With mpv_set_property(h, "property", MPV_FORMAT_STRING, ptr), ptr now
has to be of type char** instead of char*. This makes it more consistent
with mpv_get_property() and also non-pointer formats, which will be
introduced in the following commits. mpv_set_property() of course does
not change its interface (only its implementation is adjusted to keep
its interface).
This also affects mpv_set_option(), but again not
mpv_set_option_string().
Diffstat (limited to 'player')
| -rw-r--r-- | player/client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/player/client.c b/player/client.c index 39c28d2074..39d816c0bb 100644 --- a/player/client.c +++ b/player/client.c @@ -462,7 +462,7 @@ int mpv_set_option(mpv_handle *ctx, const char *name, mpv_format format, } else { if (format != MPV_FORMAT_STRING) return MPV_ERROR_OPTION_FORMAT; - const char *value = data; + const char *value = *(char **)data; int err = m_config_set_option0(ctx->mpctx->mconfig, name, value); switch (err) { case M_OPT_MISSING_PARAM: @@ -481,7 +481,7 @@ int mpv_set_option(mpv_handle *ctx, const char *name, mpv_format format, int mpv_set_option_string(mpv_handle *ctx, const char *name, const char *data) { - return mpv_set_option(ctx, name, MPV_FORMAT_STRING, (void *)data); + return mpv_set_option(ctx, name, MPV_FORMAT_STRING, &data); } // Run a command in the playback thread. @@ -635,7 +635,7 @@ int mpv_set_property(mpv_handle *ctx, const char *name, mpv_format format, .mpctx = ctx->mpctx, .name = name, .format = format, - .data = data, + .data = *(char **)data, }; run_locked(ctx, setproperty_fn, &req); return req.status; @@ -643,7 +643,7 @@ int mpv_set_property(mpv_handle *ctx, const char *name, mpv_format format, int mpv_set_property_string(mpv_handle *ctx, const char *name, const char *data) { - return mpv_set_property(ctx, name, MPV_FORMAT_STRING, (void *)data); + return mpv_set_property(ctx, name, MPV_FORMAT_STRING, &data); } int mpv_set_property_async(mpv_handle *ctx, uint64_t ud, const char *name, @@ -657,7 +657,7 @@ int mpv_set_property_async(mpv_handle *ctx, uint64_t ud, const char *name, .mpctx = ctx->mpctx, .name = talloc_strdup(req, name), .format = MPV_FORMAT_STRING, - .data = talloc_strdup(req, data), // for now always a string + .data = talloc_strdup(req, *(char **)data), // for now always a string .reply_ctx = ctx, .userdata = ud, }; |