RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-03 13:32:16 +00:00
Code Issues Releases Wiki Activity

command: reduce some property boilerplate

Browse Source 
Reduces code needed for implementing string and int64_t read-only
properties.

Originally, there actually was a m_property_string_ro(), but it was
removed, as that would have implicitly strdup'ed the string. But the
new name m_property_strdup_ro() should make it quite clear what is
happening.
This commit is contained in:
wm4 2012-10-14 23:08:39 +02:00
parent 187cbd7aa7
commit 38eb7f2fcf
3 changed files with 35 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
command.c
View File

@ -164,11 +164,7 @@ static int mp_property_path(m_option_t *prop, int action, void *arg,
{
if (!mpctx->filename)
return M_PROPERTY_UNAVAILABLE;
if (action == M_PROPERTY_GET) {
*(char **)arg = talloc_strdup(NULL, mpctx->filename);
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
return m_property_strdup_ro(prop, action, arg, mpctx->filename);
}
static int mp_property_media_title(m_option_t *prop, int action, void *arg,
@ -179,11 +175,7 @@ static int mp_property_media_title(m_option_t *prop, int action, void *arg,
name = mpctx->resolve_result->title;
if (!name)
return M_PROPERTY_UNAVAILABLE;
if (action == M_PROPERTY_GET) {
*(char **)arg = talloc_strdup(NULL, name);
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
return m_property_strdup_ro(prop, action, arg, name);
}
static int mp_property_stream_path(m_option_t *prop, int action, void *arg,
@ -192,11 +184,7 @@ static int mp_property_stream_path(m_option_t *prop, int action, void *arg,
struct stream *stream = mpctx->stream;
if (!stream || !stream->url)
return M_PROPERTY_UNAVAILABLE;
if (action == M_PROPERTY_GET) {
*(char **)arg = talloc_strdup(NULL, stream->url);
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
return m_property_strdup_ro(prop, action, arg, stream->url);
}
/// filename without path (RO)
@ -205,14 +193,8 @@ static int mp_property_filename(m_option_t *prop, int action, void *arg,
{
if (!mpctx->filename)
return M_PROPERTY_UNAVAILABLE;
if (action == M_PROPERTY_GET) {
char *f = (char *)mp_basename(mpctx->filename);
if (!*f)
f = mpctx->filename;
*(char **)arg = talloc_strdup(NULL, f);
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
char *f = (char *)mp_basename(mpctx->filename);
return m_property_strdup_ro(prop, action, arg, (*f) ? f : mpctx->filename);
}
/// Demuxer name (RO)
@ -222,11 +204,7 @@ static int mp_property_demuxer(m_option_t *prop, int action, void *arg,
struct demuxer *demuxer = mpctx->master_demuxer;
if (!demuxer)
return M_PROPERTY_UNAVAILABLE;
if (action == M_PROPERTY_GET) {
*(char **)arg = talloc_strdup(NULL, demuxer->desc->name);
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
return m_property_strdup_ro(prop, action, arg, demuxer->desc->name);
}
/// Position in the stream (RW)
@ -254,12 +232,7 @@ static int mp_property_stream_start(m_option_t *prop, int action,
struct stream *stream = mpctx->stream;
if (!stream)
return M_PROPERTY_UNAVAILABLE;
switch (action) {
case M_PROPERTY_GET:
*(int64_t *) arg = stream->start_pos;
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
return m_property_int64_ro(prop, action, arg, stream->start_pos);
}
/// Stream end offset (RO)
@ -269,12 +242,7 @@ static int mp_property_stream_end(m_option_t *prop, int action, void *arg,
struct stream *stream = mpctx->stream;
if (!stream)
return M_PROPERTY_UNAVAILABLE;
switch (action) {
case M_PROPERTY_GET:
*(int64_t *) arg = stream->end_pos;
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
return m_property_int64_ro(prop, action, arg, stream->end_pos);
}
/// Stream length (RO)
@ -284,12 +252,8 @@ static int mp_property_stream_length(m_option_t *prop, int action,
struct stream *stream = mpctx->stream;
if (!stream)
return M_PROPERTY_UNAVAILABLE;
switch (action) {
case M_PROPERTY_GET:
*(int64_t *) arg = stream->end_pos - stream->start_pos;
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
return m_property_int64_ro(prop, action, arg,
stream->end_pos - stream->start_pos);
}
/// Current stream position in seconds (RO)

20
m_property.c
View File

@ -324,6 +324,16 @@ int m_property_int_ro(const m_option_t *prop, int action,
return M_PROPERTY_NOT_IMPLEMENTED;
}
int m_property_int64_ro(const struct m_option* prop, int action, void* arg,
int64_t var)
{
if (action == M_PROPERTY_GET) {
*(int64_t *)arg = var;
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
}
int m_property_float_ro(const m_option_t *prop, int action,
void *arg, float var)
{
@ -343,3 +353,13 @@ int m_property_double_ro(const m_option_t *prop, int action,
}
return M_PROPERTY_NOT_IMPLEMENTED;
}
int m_property_strdup_ro(const struct m_option* prop, int action, void* arg,
const char *var)
{
if (action == M_PROPERTY_GET) {
*(char **)arg = talloc_strdup(NULL, var);
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
}

5
m_property.h
View File

@ -20,6 +20,7 @@
#define MPLAYER_M_PROPERTY_H
#include <stdbool.h>
#include <stdint.h>
struct m_option;
@ -129,9 +130,13 @@ char* m_properties_expand_string(const struct m_option* prop_list, char *str,
// Trivial helpers for implementing properties.
int m_property_int_ro(const struct m_option* prop, int action, void* arg,
int var);
int m_property_int64_ro(const struct m_option* prop, int action, void* arg,
int64_t var);
int m_property_float_ro(const struct m_option* prop, int action, void* arg,
float var);
int m_property_double_ro(const struct m_option* prop, int action, void* arg,
double var);
int m_property_strdup_ro(const struct m_option* prop, int action, void* arg,
const char *var);
#endif /* MPLAYER_M_PROPERTY_H */