RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Add a client API 

Add a client API, which is intended to be a stable API to get some rough
control over the player. Basically, it reflects what can be done with
input.conf commands or the old slavemode. It will replace the old
slavemode (and enable the implementation of a new slave protocol).
This commit is contained in:
wm4 2014-02-10 21:01:35 +01:00
parent c6166ff448
commit 88ae914b1e
11 changed files with 1892 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

809
libmpv/client.h Normal file
View File

@ -0,0 +1,809 @@
/* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
* Note: the client API is licensed under ISC (see above) to ease
* interoperability with other licenses. But keep in mind that the
* mpv core is still mostly GPLv2+. It's up to lawyers to decide
* whether applications using this API are affected by the GPL.
* One argument against this is that proprietary applications
* using mplayer in slave mode is apparently tolerated, and this
* API is basically equivalent to slave mode.
*/
#ifndef MPV_CLIENT_API_H_
#define MPV_CLIENT_API_H_
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
/**
* Warning: this API is still work in progress. This notice will be removed
* once the API is considered reasonably stable.
*/
/**
* Mechanisms provided by this API
* -------------------------------
*
* This API provides general control over mpv playback. It does not give you
* direct access to individual components of the player, only the whole thing.
* It's somewhat equivalent to MPlayer's slave mode. You can send commands,
* retrieve or set playback status or settings with properties, and receive
* events.
*
* The API can be used in two ways:
* 1) Internally in mpv, to provide additional features to the command line
* player. Lua scripting uses this. (Currently there is no plugin API to
* get a client API handle in external user code. It has to be a fixed
* part of the player at compilation time.)
* 2) Using mpv as a library with mpv_create(). This basically allows embedding
* mpv in other applications.
*
* Event loop
* ----------
*
* In general, the API user should run an event loop (with mpv_wait_event())
* in order to receive events, although it also should be possible to integrate
* client API usage in other event loops (e.g. GUI toolkits) with the
* mpv_set_wakeup_callback() function, and then polling for events by calling
* mpv_wait_event() with a 0 timeout.
*
* Note that the event loop is detached from the actual player. Not calling
* mpv_wait_event() will not stop playback. It will eventually congest the
* event queue of your API handle, though.
*
* Synchronous vs. asynchronous calls
* ----------------------------------
*
* The API allows both synchronous and asynchronous calls. Synchronous calls
* have to wait until the playback core is ready, which currently can take
* an unbounded time (e.g. if network is slow or unresponsive). Asynchronous
* calls just queue operations as requests, and return the result of the
* operation as events.
*
* Asynchronous calls
* ------------------
*
* The client API includes asynchronous functions. These allow you to send
* requests instantly, and get replies as events at a later point. The
* requests are made with functions carrying the _async suffix, and replies
* are returned by mpv_wait_event() (interleaved with the normal event stream).
*
* A 64 bit userdata value is used to allow the user to associate requests
* with replies. The value is passed as reply_userdata parameter to the request
* function. The reply to the request will have the reply
* mpv_event->reply_userdata field set to the same value as the
* reply_userdata parameter of the corresponding request.
*
* This userdata value is arbitrary and is never interpreted by the API. Note
* that the userdata value 0 is also allowed, but then the client must be
* careful not accidentally interpret the mpv_event->reply_userdata if an
* event is not a reply. (For non-replies, this field is set to 0.)
*
* Currently, asynchronous calls are always strictly ordered (even with
* synchronous calls) for each client, although that may change in the future.
*
* Multithreading
* --------------
*
* The client API is generally fully thread-safe, unless otherwise noted.
* Currently, there is no real advantage in using more than 1 thread to access
* the client API, since everything is serialized through a single lock in the
* playback core.
*
* Basic environment requirements
* ------------------------------
*
* This documents basic requirements on the C environment. This is especially
* important if mpv is used as library with mpv_create().
*
* - The LC_NUMERIC locale category must be set to "C". If your program calls
* setlocale(), be sure not to use LC_ALL, or if you do, reset LC_NUMERIC
* to its sane default: setlocale(LC_NUMERIC, "C").
* - If a X11 based VO is used, mpv will set the xlib error handler. This error
* handler is process-wide, and there's no proper way to share it with other
* xlib users within the same process. This might confuse GUI toolkits.
* - The FPU precision must be set at least to double precision.
* - On Windows, mpv will call timeBeginPeriod(1).
*
* Embedding the video window
* --------------------------
*
* Currently you have to get the raw window handle, and set it as "wid" option.
* This works on X11 and win32 only. In addition, it works with a few VOs only,
* and VOs which do not support this will just create a freestanding window.
*
* Both on X11 and win32, the player will fill the window referenced by the
* "wid" option fully and letterbox the video (i.e. add black bars if the
* aspect ratio of the window and the video mismatch).
*/
/**
* The version is incremented on each change. The 16 lower bits are incremented
* if something in mpv is changed that might affect the client API, but doesn't
* change C API itself (like the removal of an option or a property). The higher
* 16 bits are incremented if the C API itself changes.
*/
#define MPV_CLIENT_API_VERSION 0x00000000UL
/**
* Return the MPV_CLIENT_API_VERSION the mpv source has been compiled with.
*/
unsigned long mpv_client_api_version(void);
/**
* Client context used by the client API. Every client has its own private
* handle.
*/
typedef struct mpv_handle mpv_handle;
/**
* List of error codes than can be returned by API functions. 0 and positive
* return values always mean success, negative values are always errors.
*/
typedef enum mpv_error {
/**
* No error happened (used to signal successful operation).
* Keep in mind that many API functions returning error codes can also
* return positive values, which also indicate success. API users can
* hardcode the fact that ">= 0" means success.
*/
MPV_ERROR_SUCCESS = 0,
/**
* The event ringbuffer is full. This means the client is choked, and can't
* receive any events. This can happen when too many asynchronous requests
* have been made, but not answered. Probably never happens in practice,
* unless the mpv core is frozen for some reason, and the client keeps
* making asynchronous requests. (Bugs in the client API implementation
* could also trigger this, e.g. if events become "lost".)
*/
MPV_ERROR_EVENT_QUEUE_FULL = -1,
/**
* Memory allocation failed.
*/
MPV_ERROR_NOMEM = -2,
/**
* The mpv core wasn't configured and initialized yet. See the notes in
* mpv_create().
*/
MPV_ERROR_UNINITIALIZED = -3,
/**
* Generic catch-all error if a parameter is set to an invalid or
* unsupported value. This is used if there is no better error code.
*/
MPV_ERROR_INVALID_PARAMETER = -4,
/**
* Trying to set an option that doesn't exist.
*/
MPV_ERROR_OPTION_NOT_FOUND = -5,
/**
* Trying to set an option using an unsupported MPV_FORMAT.
*/
MPV_ERROR_OPTION_FORMAT = -6,
/**
* Setting the option failed. Typically this happens if the provided option
* value could not be parsed.
*/
MPV_ERROR_OPTION_ERROR = -7,
/**
* The accessed property doesn't exist.
*/
MPV_ERROR_PROPERTY_NOT_FOUND = -8,
/**
* Trying to set or get a property using an unsupported MPV_FORMAT.
*/
MPV_ERROR_PROPERTY_FORMAT = -9,
/**
* The property exists, but is not available. This usually happens when the
* associated subsystem is not active, e.g. querying audio parameters while
* audio is disabled.
*/
MPV_ERROR_PROPERTY_UNAVAILABLE = -10,
/**
* Error setting or getting a property.
*/
MPV_ERROR_PROPERTY_ERROR = -11,
} mpv_error;
/**
* Return a string describing the error. For unknown errors, the string
* "unknown error" is returned.
*
* @param error error number, see enum mpv_error
* @return A static string describing the error. The string is completely
* static, i.e. doesn't need to be deallocated, and is valid forever.
*/
const char *mpv_error_string(int error);
/**
* General function to deallocate memory returned by some of the API functions.
* Call this only if it's explicitly documented as allowed. Calling this on
* mpv memory not owned by the caller will lead to undefined behavior.
*
* @param data A valid pointer returned by the API, or NULL.
*/
void mpv_free(void *data);
/**
* Return the name of this client handle. Every client has its own unique
* name, which is mostly used for user interface purposes.
*
* @return The client name. The string is read-only and is valid until
* mpv_destroy() is called.
*/
const char *mpv_client_name(mpv_handle *ctx);
/**
* Create a new mpv instance and an associated client API handle to control
* the mpv instance. This instance is in a pre-initialized state,
* and needs to be initialized to be actually used with most other API
* functions.
*
* Most API functions will return MPV_ERROR_UNINITIALIZED in the uninitialized
* state. You can call mpv_set_option() (or mpv_set_option_string() and other
* variants) to set initial options. After this, call mpv_initialize() to start
* the player, and then use e.g. mpv_command() to start playback of a file.
*
* The point of separating handle creation and actual initialization is that
* you can configure things which can't be changed during runtime.
*
* Unlike the command line player, this will have initial settings suitable
* for embedding in applications. The following settings are different:
* - stdin/stdout/stderr and the terminal will never be accessed. This is
* equivalent to setting the --no-terminal option.
* (Technically, this also suppresses C signal handling.)
* - No config files will be loaded. This is roughly equivalent to using
* --no-config (but actually the code path for loading config files is
* disabled).
* - Idle mode is enabled, which means the playback core will enter idle mode
* if there are no more files to play on the internal playlist, instead of
* exiting. This is equivalent to the --idle option.
* - Disable parts of input handling.
*
* All this assumes that API users want a mpv instance that is strictly
* isolated from the command line player's configuration, user settings, and
* so on. You can re-enable disabled features by setting the appropriate
* options.
*
* The mpv command line parser is not available through this API, but you can
* set individual options with mpv_set_option(). Files for playback must be
* loaded with mpv_command() or others.
*
* Note that you should avoid doing concurrent accesses on the uninitialized
* client handle. (Whether concurrent access is definitely allowed or not has
* yet to be decided.)
*
* @return a new mpv client API handle
*/
mpv_handle *mpv_create(void);
/**
* Initialize an uninitialized mpv instance. If the mpv instance is already
* running, an error is retuned.
*
* This function needs to be called to make full use of the client API if the
* client API handle was created with mpv_create().
*
* @return error code
*/
int mpv_initialize(mpv_handle *ctx);
/**
* Disconnect and destroy the client context. ctx will be deallocated with this
* API call. This leaves the player running. If you want to be sure that the
* player is terminated, send a "quit" command, and wait until the
* MPV_EVENT_SHUTDOWN event is received.
*/
void mpv_destroy(mpv_handle *ctx);
/**
* Stop the playback thread. Normally, the client API stops the playback thread
* automatically in order to process requests. However, the playback thread is
* restarted again after the request was processed. Then the playback thread
* will continue to display the next video frame, during which it will not
* reply to any requests. (This takes up to 50ms.)
*
* (Internally, it first renders the video and other things, and then blocks
* until it can be displayed - and it won't react to anything else in that
* time. The main reason for that is that the VO is in a "in between" state,
* in which it can't process normal requests - for example, OSD redrawing or
* screenshots would be broken.)
*
* This is usually a problem: only 1 request per video frame will be executed,
* which will make the client API to appear extremely slow.
*
* Suspending the playback thread allows you to prevent the playback thread from
* running, so that you can make multiple accesses without being blocked.
*
* Suspension is reentrant and recursive for convenience. Any thread can call
* the suspend function multiple times, and the playback thread will remain
* suspended until the last thread resumes it. Note that during suspension,
* clients still have concurrent access to the core, which is serialized through
* a single mutex.
*
* Call mpv_resume() to resume the playback thread. You must call mpv_resume()
* for each mpv_suspend() call. Calling mpv_resume() more often than
* mpv_suspend() is not allowed.
*
* Calling this on an uninitialized player (see mpv_create()) will deadlock.
*
* Note: the need for this call might go away at some point.
*/
void mpv_suspend(mpv_handle *ctx);
/**
* See mpv_suspend().
*/
void mpv_resume(mpv_handle *ctx);
/**
* Data format for options and properties. The API functions to get/set
* properties and options support multiple formats, and this enum describes
* them.
*/
typedef enum mpv_format {
/**
* Invalid.
*/
MPV_FORMAT_NONE = 0,
/**
* The basic type is char*. It returns the raw property string, like
* using ${=property} in input.conf (see input.rst).
*
* Example for reading:
*
* char *result = NULL;
* if (mpv_get_property(ctx, "property", MPV_FORMAT_STRING, &result) < 0)
* goto error;
* printf("%s\n", result);
* mpv_free(result);
*
* Example for writing:
*
* char *value = "the new value";
* mpv_set_property(ctx, "property", MPV_FORMAT_STRING, (void *)value);
*
*/
MPV_FORMAT_STRING = 1,
/**
* The basic type is char*. It returns the OSD property string, like
* using ${property} in input.conf (see input.rst). In many cases, this
* is the same as the raw string, but in other cases it's formatted for
* display on OSD. It's intended to be human readable. Do not attempt to
* parse these strings.
*
* Only valid when doing read access. The rest works like MPV_FORMAT_STRING.
*/
MPV_FORMAT_OSD_STRING = 2,
} mpv_format;
/**
* Set an option. Note that you can't normally set options during runtime. It
* works in uninitialized state (see mpv_create()), and in some cases in idle
* mode.
*
* You can use mpv_set_property() to change options during playback, but this
* does not work with all options.
*
* @param name Option name. This is the same as on the mpv command line, but
* without the leading "--".
* @param format see enum mpv_format. Currently, only MPV_FORMAT_STRING is valid.
* @param[in] data Option value (according to the format).
* @return error code
*/
int mpv_set_option(mpv_handle *ctx, const char *name, mpv_format format,
void *data);
/**
* Convenience function to set an option to a string value. This is like
* calling mpv_set_option() with MPV_FORMAT_STRING.
*
* @return error code
*/
int mpv_set_option_string(mpv_handle *ctx, const char *name, const char *data);
/**
* Send a command to the player. Commands are the same as those used in
* input.conf, except that this function takes parameters in a pre-split
* form.
*
* The commands and their parameters are documented in input.rst.
*
* Caveat: currently, commands do not report whether they run successfully. If
* the command exists and its arguments are not broken, always success
* will be returned.
*
* @param[in] args NULL-terminated list of strings. Usually, the first item
* is the command, and the following items are arguments.
* @return error code
*/
int mpv_command(mpv_handle *ctx, const char **args);
/**
* Same as mpv_command, but use input.conf parsing for splitting arguments.
* This is slightly simpler, but also more error prone, since arguments may
* need quoting/escaping.
*/
int mpv_command_string(mpv_handle *ctx, const char *args);
/**
* Same as mpv_command, but run the command asynchronously.
*
* Commands are executed asynchronously. You will receive a
* MPV_EVENT_COMMAND_REPLY event. (This event will also have an
* error code set if running the command failed.)
*
* @param reply_userdata see section about asynchronous calls
* @param args NULL-terminated list of strings (see mpv_command())
* @return error code
*/
int mpv_command_async(mpv_handle *ctx, uint64_t reply_userdata,
const char **args);
/**
* Set a property to a given value. Properties are essentially variables which
* can be queried or set at runtime. For example, writing to the pause property
* will actually pause or unpause playback.
*
* @param name The property name. See input.rst for a list of properties.
* @param format see enum mpv_format. Currently, only MPV_FORMAT_STRING is valid.
* @param[in] data Option value.
* @return error code
*/
int mpv_set_property(mpv_handle *ctx, const char *name, mpv_format format,
void *data);
/**
* Convenience function to set a property to a string value.
*
* This is like calling mpv_set_property() with MPV_FORMAT_STRING.
*/
int mpv_set_property_string(mpv_handle *ctx, const char *name, const char *data);
/**
* Set a property asynchronously. You will receive the result of the operation
* as MPV_EVENT_PROPERTY_SET_REPLY event. The mpv.error field will contain the
* result status of the operation. Otherwise, this function is similar to
* mpv_set_property().
*
* @param reply_userdata see section about asynchronous calls
* @param name The property name.
* @param format see enum mpv_format. Currently, only MPV_FORMAT_STRING is valid.
* @param[in] data Option value. The value will be copied by the function.
* @return error code if sending the request failed
*/
int mpv_set_property_async(mpv_handle *ctx, uint64_t reply_userdata,
const char *name, mpv_format format, void *data);
/**
* Read the value of the given property.
*
* @param name The property name.
* @param format see enum mpv_format.
* @param[out] data Pointer to the variable holding the option value. On
* success, the variable will be set to a copy of the option
* value. You can free the value with mpv_free().
* @return error code
*/
int mpv_get_property(mpv_handle *ctx, const char *name, mpv_format format,
void *data);
/**
* Return the value of the property with the given name as string. This is
* equivalent to mpv_get_property() with MPV_FORMAT_STRING.
*
* On error, NULL is returned. Use mpv_get_property() if you want fine-grained
* error reporting.
*
* @param name The property name.
* @return Property value, or NULL if the property can't be retrieved. Free
* the string with mpv_free().
*/
char *mpv_get_property_string(mpv_handle *ctx, const char *name);
/**
* Return the property as "OSD" formatted string. This is the same as
* mpv_get_property_string, but using MPV_FORMAT_OSD_STRING.
*
* @return Property value, or NULL if the property can't be retrieved. Free
* the string with mpv_free().
*/
char *mpv_get_property_osd_string(mpv_handle *ctx, const char *name);
/**
* Get a property asynchronously. You will receive the result of the operation
* as well as the property data with the MPV_EVENT_GET_PROPERTY_REPLY event.
*
* @param reply_userdata see section about asynchronous calls
* @param name The property name.
* @param format see enum mpv_format.
* @return error code if sending the request failed
*/
int mpv_get_property_async(mpv_handle *ctx, uint64_t reply_userdata,
const char *name, mpv_format format);
typedef enum mpv_event_id {
/**
* Nothing happened. Happens on timeouts or sporadic wakeups.
*/
MPV_EVENT_NONE = 0,
/**
* Happens when the player quits. The player enters a state where it tries
* to disconnect all clients. Most requests to the player will fail, and
* mpv_wait_event() will always return instantly (returning new shutdown
* events if no other events are queued). The client should react to this
* and quit with mpv_destroy() as soon as possible.
*/
MPV_EVENT_SHUTDOWN = 1,
/**
* See mpv_request_log_messages().
*/
MPV_EVENT_LOG_MESSAGE = 2,
/**
* Reply to a mpv_get_property_async() request.
* See also mpv_event and mpv_event_property.
*/
MPV_EVENT_GET_PROPERTY_REPLY = 3,
/**
* Reply to a mpv_set_property_async() request.
* (Unlike MPV_EVENT_GET_PROPERTY, mpv_event_property is not used.)
*/
MPV_EVENT_SET_PROPERTY_REPLY = 4,
/**
* Reply to a mpv_command_async() request.
*/
MPV_EVENT_COMMAND_REPLY = 5,
/**
* Notification before playback start of a file.
*/
MPV_EVENT_START_FILE = 6,
/**
* Notification after playback end (after the file was unloaded).
*/
MPV_EVENT_END_FILE = 7,
/**
* Notification when the file has been loaded (headers were read etc.), and
* decoding starts.
*/
MPV_EVENT_PLAYBACK_START = 8,
/**
* The list of video/audio/subtitle tracks was changed.
*/
MPV_EVENT_TRACKS_CHANGED = 9,
/**
* A video/audio/subtitle track was switched on or off.
*/
MPV_EVENT_TRACK_SWITCHED = 10,
/**
* Idle mode was entered. In this mode, no file is played, and the playback
* core waits for new commands. (The command line player normally quits
* instead of entering idle mode, unless --idle was specified. If mpv
* was started with mpv_create(), idle mode is enabled by default.)
*/
MPV_EVENT_IDLE = 11,
/**
* Playback was paused.
*/
MPV_EVENT_PAUSE = 12,
/**
* Playback was unpaused.
*/
MPV_EVENT_UNPAUSE = 13,
/**
* Sent every time after a video frame is displayed (or in lower frequency
* if there is no video, or playback is paused).
*/
MPV_EVENT_TICK = 14,
/**
* Triggered by the script_dispatch input command. The command uses the
* client name (see mpv_client_name()) to dispatch keyboard or mouse input
* to a client.
*/
MPV_EVENT_SCRIPT_INPUT_DISPATCH = 15,
} mpv_event_id;
/**
* Return a string describing the event. For unknown events, NULL is returned.
*
* Note that all events actually returned by the API will also yield a non-NULL
* string with this function.
*
* @param event event ID, see see enum mpv_event_id
* @return A static string giving a short symbolic name of the event. It
* consists of lower-case alphanumeric characters and can include "-"
* characters. This string is suitable for use in e.g. scripting
* interfaces.
* The string is completely static, i.e. doesn't need to be deallocated,
* and is valid forever.
*/
const char *mpv_event_name(mpv_event_id event);
typedef struct mpv_event_property {
/**
* Name of the property.
*/
const char *name;
/**
* Format of the given data. See enum mpv_format.
* This is always the same format as the requested format.
*/
mpv_format format;
/**
* Received property value. Depends on the format.
* Note that this is set to NULL if retrieving the property failed.
* See mpv_event.error for the status.
*/
void *data;
} mpv_event_property;
typedef struct mpv_event_log_message {
/**
* The module prefix, identifies the sender of the message.
*/
const char *prefix;
/**
* The log level as string. See mpv_request_log_messages() for possible
* values.
*/
const char *level;
/**
* The log message. Note that this is the direct output of a printf()
* style output API. The text will contain embedded newlines, and it's
* possible that a single message contains multiple lines, or that a
* message contains a partial line.
*
* It's safe to display messages only if they end with a newline character,
* and to buffer them otherwise.
*/
const char *text;
} mpv_event_log_message;
typedef struct mpv_event_script_input_dispatch {
/**
* Arbitrary integer value that was provided as argument to the
* script_dispatch input command.
*/
int arg0;
/**
* Type of the input. Currently either "keyup_follows" (basically a key
* down event), or "press" (either a single key event, or a key up event
* following a "keyup_follows" event).
*/
const char *type;
} mpv_event_script_input_dispatch;
typedef struct mpv_event {
/**
* One of mpv_event. Keep in mind that later ABI compatible releases might
* add new event types. These should be ignored by the API user.
*/
mpv_event_id event_id;
/**
* This is used for MPV_EVENT_ERROR only, and contains the error code.
* It is set to 0 for all other events.
*/
int error;
/**
* If the event is in reply to a request (made with this API and this
* API handle), this is set to the reply_userdata parameter of the request
* call.
* Otherwise, this field is 0.
*/
uint64_t reply_userdata;
/**
* The meaning and contents of data member depend on the event_id:
* MPV_EVENT_GET_PROPERTY_REPLY: mpv_event_property*
* MPV_EVENT_LOG_MESSAGE: mpv_event_log_message*
* MPV_EVENT_SCRIPT_INPUT_DISPATCH: mpv_event_script_input_dispatch*
* other: NULL
*
* Note: future enhancements might add new event struct for existing or new
* event types.
*/
void *data;
} mpv_event;
/**
* Enable or disable the given event.
*
* Some events are enabled by default. Some events can't be disabled.
*
* (Informational note: currently, all events are enabled by default, except
* MPV_EVENT_TICK.)
*
* @param event See enum mpv_event_id.
* @param enable 1 to enable receiving this event, 0 to disable it.
* @return error code
*/
int mpv_request_event(mpv_handle *ctx, mpv_event_id event, int enable);
/**
* Enable or disable receiving of log messages. These are the messages the
* command line player prints to the terminal. This call sets the minimum
* required log level for a message to be received with MPV_EVENT_LOG_MESSAGE.
*
* @param min_level Minimal log level as string. Valid log levels:
* no fatal error warn info status v debug trace
* The value "no" disables all messages. This is the default.
*/
int mpv_request_log_messages(mpv_handle *ctx, const char *min_level);
/**
* Wait for the next event, or until the timeout expires, or if another thread
* makes a call to mpv_wakeup(). Passing 0 as timeout will never wait, and
* is suitable for polling.
*
* The internal event queue has a limited size (per client handle). If you
* don't empty the event queue quickly enough with mpv_wait_event(), it will
* overflow and silently discard further events. If this happens, making
* asynchronous requests will fail as well (with MPV_ERROR_EVENT_QUEUE_FULL).
*
* Only one thread is allowed to call this at a time. The API won't complain
* if more than one thread calls this, but it will cause race conditions in
* the client when accessing the shared mpv_event struct. Note that most other
* API functions are not restricted by this, and no API function internally
* calls mpv_wait_event().
*
* @param timeout Timeout in seconds, after which the function returns even if
* no event was received. A MPV_EVENT_NONE is returned on
* timeout. Values <= 0 will disable waiting.
* @return A struct containing the event ID and other data. The pointer (and
* fields in the struct) stay valid until the next mpv_wait_event()
* call, or until mpv_destroy() is called. You must not write to
* the struct, and all memory referenced by it will be automatically
* released by the API. The return value is never NULL.
*/
mpv_event *mpv_wait_event(mpv_handle *ctx, double timeout);
/**
* Interrupt the current mpv_wait_event() call. This will wake up the thread
* currently waiting in mpv_wait_event(). If no thread is waiting, the next
* mpv_wait_event() call will return immediately (this is to avoid lost
* wakeups).
*
* mpv_wait_event() will receive a MPV_EVENT_NONE if it's woken up due to
* this call. But note that this dummy event might be skipped if there are
* already another events queued. All what counts is that the waiting thread
* is woken up.
*/
void mpv_wakeup(mpv_handle *ctx);
/**
* Set a custom function that should be called when there are new events. Use
* this if blocking in mpv_wait_event() to wait for new events is not feasible.
*
* Keep in mind that the callback will be called from foreign threads. You
* must not make any assumptions of the environment, and you must return as
* soon as possible. You are not allowed to call any client API functions
* inside of the callback. In particular, you should not do any processing in
* the callback, but wake up another thread that does all the work.
*
* In general, the client API expects you to call mpv_wait_event() to receive
* notifications, and the wakeup callback is merely a helper utility to make
* this easier in certain situations.
*
* If you actually want to do processing in a callback, spawn a thread that
* does nothing but call mpv_wait_event() in a loop and dispatches the result
* to a callback.
*/
void mpv_set_wakeup_callback(mpv_handle *ctx, void (*cb)(void *d), void *d);
#ifdef __cplusplus
}
#endif
#endif

1
old-makefile
View File

@ -224,6 +224,7 @@ SOURCES = audio/audio.c \
osdep/timer.c \
osdep/threads.c \
player/audio.c \
player/client.c \
player/configfiles.c \
player/command.c \
player/dvdnav.c \

856
player/client.c Normal file
View File

@ -0,0 +1,856 @@
/* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <stddef.h>
#include <stdlib.h>
#include <assert.h>
#include "common/common.h"
#include "common/msg.h"
#include "common/msg_control.h"
#include "input/input.h"
#include "misc/ring.h"
#include "options/m_config.h"
#include "options/m_option.h"
#include "options/m_property.h"
#include "osdep/threads.h"
#include "command.h"
#include "core.h"
#include "client.h"
struct mp_client_api {
struct MPContext *mpctx;
pthread_mutex_t lock;
// -- protected by lock
struct mpv_handle **clients;
int num_clients;
};
struct mpv_handle {
// -- immmutable
char *name;
struct mp_log *log;
struct MPContext *mpctx;
struct mp_client_api *clients;
// -- not thread-safe
struct mpv_event *cur_event;
pthread_mutex_t lock;
pthread_cond_t wakeup;
// -- protected by lock
uint64_t event_mask;
bool queued_wakeup;
bool shutdown;
bool choke_warning;
void (*wakeup_cb)(void *d);
void *wakeup_cb_ctx;
struct mp_ring *events; // stores mpv_event
int max_events; // allocated number of entries in events
int reserved_events; // number of entries reserved for replies
struct mp_log_buffer *messages;
int messages_level;
};
void mp_clients_init(struct MPContext *mpctx)
{
mpctx->clients = talloc_ptrtype(NULL, mpctx->clients);
*mpctx->clients = (struct mp_client_api) {
.mpctx = mpctx,
};
pthread_mutex_init(&mpctx->clients->lock, NULL);
}
void mp_clients_destroy(struct MPContext *mpctx)
{
if (!mpctx->clients)
return;
assert(mpctx->clients->num_clients == 0);
pthread_mutex_destroy(&mpctx->clients->lock);
talloc_free(mpctx->clients);
mpctx->clients = NULL;
}
int mp_clients_num(struct MPContext *mpctx)
{
pthread_mutex_lock(&mpctx->clients->lock);
int num_clients = mpctx->clients->num_clients;
pthread_mutex_unlock(&mpctx->clients->lock);
return num_clients;
}
static struct mpv_handle *find_client(struct mp_client_api *clients,
const char *name)
{
for (int n = 0; n < clients->num_clients; n++) {
if (strcmp(clients->clients[n]->name, name) == 0)
return clients->clients[n];
}
return NULL;
}
struct mpv_handle *mp_new_client(struct mp_client_api *clients, const char *name)
{
pthread_mutex_lock(&clients->lock);
char *unique_name = NULL;
if (find_client(clients, name)) {
for (int n = 2; n < 1000; n++) {
unique_name = talloc_asprintf(NULL, "%s%d", name, n);
if (!find_client(clients, unique_name))
break;
talloc_free(unique_name);
unique_name = NULL;
}
if (!unique_name) {
pthread_mutex_unlock(&clients->lock);
return NULL;
}
}
if (!unique_name)
unique_name = talloc_strdup(NULL, name);
int num_events = 1000;
struct mpv_handle *client = talloc_ptrtype(NULL, client);
*client = (struct mpv_handle){
.name = talloc_steal(client, unique_name),
.log = mp_log_new(client, clients->mpctx->log, unique_name),
.mpctx = clients->mpctx,
.clients = clients,
.cur_event = talloc_zero(client, struct mpv_event),
.events = mp_ring_new(client, num_events * sizeof(struct mpv_event)),
.max_events = num_events,
.event_mask = ((uint64_t)-1) & ~(1ULL << MPV_EVENT_TICK),
};
pthread_mutex_init(&client->lock, NULL);
pthread_cond_init(&client->wakeup, NULL);
MP_TARRAY_APPEND(clients, clients->clients, clients->num_clients, client);
pthread_mutex_unlock(&clients->lock);
return client;
}
const char *mpv_client_name(mpv_handle *ctx)
{
return ctx->name;
}
struct mp_log *mp_client_get_log(struct mpv_handle *ctx)
{
return ctx->log;
}
static void wakeup_client(struct mpv_handle *ctx)
{
pthread_cond_signal(&ctx->wakeup);
if (ctx->wakeup_cb)
ctx->wakeup_cb(ctx->wakeup_cb_ctx);
}
void mpv_set_wakeup_callback(mpv_handle *ctx, void (*cb)(void *d), void *d)
{
pthread_mutex_lock(&ctx->lock);
ctx->wakeup_cb = cb;
ctx->wakeup_cb_ctx = d;
pthread_mutex_unlock(&ctx->lock);
}
void mpv_suspend(mpv_handle *ctx)
{
mp_dispatch_suspend(ctx->mpctx->dispatch);
}
void mpv_resume(mpv_handle *ctx)
{
mp_dispatch_resume(ctx->mpctx->dispatch);
}
void mpv_destroy(mpv_handle *ctx)
{
struct mp_client_api *clients = ctx->clients;
pthread_mutex_lock(&clients->lock);
for (int n = 0; n < clients->num_clients; n++) {
if (clients->clients[n] == ctx) {
MP_TARRAY_REMOVE_AT(clients->clients, clients->num_clients, n);
while (mp_ring_buffered(ctx->events)) {
struct mpv_event event;
int r = mp_ring_read(ctx->events, (unsigned char *)&event,
sizeof(event));
assert(r == sizeof(event));
talloc_free(event.data);
}
mp_msg_log_buffer_destroy(ctx->messages);
pthread_cond_destroy(&ctx->wakeup);
pthread_mutex_destroy(&ctx->lock);
talloc_free(ctx);
ctx = NULL;
// shutdown_clients() sleeps to avoid wasting CPU
mp_input_wakeup(clients->mpctx->input);
// TODO: make core quit if there are no clients
break;
}
}
pthread_mutex_unlock(&clients->lock);
assert(!ctx);
}
mpv_handle *mpv_create(void)
{
struct MPContext *mpctx = mp_create();
mpv_handle *ctx = mp_new_client(mpctx->clients, "main");
if (ctx) {
// Set some defaults.
mpv_set_option_string(ctx, "idle", "yes");
mpv_set_option_string(ctx, "terminal", "no");
mpv_set_option_string(ctx, "osc", "no");
mpv_set_option_string(ctx, "input-default-bindings", "no");
} else {
mp_destroy(mpctx);
}
return ctx;
}
static void *playback_thread(void *p)
{
struct MPContext *mpctx = p;
pthread_detach(pthread_self());
mp_play_files(mpctx);
// This actually waits until all clients are gone before actually
// destroying mpctx.
mp_destroy(mpctx);
return NULL;
}
int mpv_initialize(mpv_handle *ctx)
{
if (mp_initialize(ctx->mpctx) < 0)
return MPV_ERROR_INVALID_PARAMETER;
pthread_t thread;
if (pthread_create(&thread, NULL, playback_thread, ctx->mpctx) != 0)
return MPV_ERROR_NOMEM;
return 0;
}
// Reserve an entry in the ring buffer. This can be used to guarantee that the
// reply can be made, even if the buffer becomes congested _after_ sending
// the request.
// Returns an error code if the buffer is full.
static int reserve_reply(struct mpv_handle *ctx)
{
int res = MPV_ERROR_EVENT_QUEUE_FULL;
pthread_mutex_lock(&ctx->lock);
if (ctx->reserved_events < ctx->max_events) {
ctx->reserved_events++;
res = 0;
}
pthread_mutex_unlock(&ctx->lock);
return res;
}
static int send_event(struct mpv_handle *ctx, struct mpv_event *event)
{
pthread_mutex_lock(&ctx->lock);
if (!(ctx->event_mask & (1ULL << event->event_id))) {
pthread_mutex_unlock(&ctx->lock);
return 0;
}
int num_events = mp_ring_available(ctx->events) / sizeof(*event);
int r = 0;
if (num_events > ctx->reserved_events) {
r = mp_ring_write(ctx->events, (unsigned char *)event, sizeof(*event));
if (r != sizeof(*event))
abort();
wakeup_client(ctx);
}
if (!r && !ctx->choke_warning) {
mp_err(ctx->log, "Too many events queued.\n");
ctx->choke_warning = true;
}
pthread_mutex_unlock(&ctx->lock);
return r ? 0 : -1;
}
// Send a reply; the reply must have been previously reserved with
// reserve_reply (otherwise, use send_event()).
static void send_reply(struct mpv_handle *ctx, uint64_t userdata,
struct mpv_event *event)
{
event->reply_userdata = userdata;
pthread_mutex_lock(&ctx->lock);
assert(ctx->reserved_events > 0);
ctx->reserved_events--;
int r = mp_ring_write(ctx->events, (unsigned char *)event, sizeof(*event));
if (r != sizeof(*event))
abort();
wakeup_client(ctx);
pthread_mutex_unlock(&ctx->lock);
}
static void status_reply(struct mpv_handle *ctx, int event,
uint64_t userdata, int status)
{
struct mpv_event reply = {
.event_id = event,
.error = status,
};
send_reply(ctx, userdata, &reply);
}
void mp_client_broadcast_event(struct MPContext *mpctx, int event, void *data)
{
struct mp_client_api *clients = mpctx->clients;
struct mpv_event event_data = {
.event_id = event,
.data = data,
};
pthread_mutex_lock(&clients->lock);
for (int n = 0; n < clients->num_clients; n++)
send_event(clients->clients[n], &event_data);
pthread_mutex_unlock(&clients->lock);
talloc_free(data);
}
int mp_client_send_event(struct MPContext *mpctx, const char *client_name,
int event, void *data)
{
struct mp_client_api *clients = mpctx->clients;
int r = 0;
struct mpv_event event_data = {
.event_id = event,
.data = data,
};
pthread_mutex_lock(&clients->lock);
struct mpv_handle *ctx = find_client(clients, client_name);
if (ctx) {
r = send_event(ctx, &event_data);
} else {
r = -1;
talloc_free(data);
}
pthread_mutex_unlock(&clients->lock);
return r;
}
int mpv_request_event(mpv_handle *ctx, mpv_event_id event, int enable)
{
if (!mpv_event_name(event) || enable < 0 || enable > 1)
return MPV_ERROR_INVALID_PARAMETER;
pthread_mutex_lock(&ctx->lock);
uint64_t bit = 1LLU << event;
ctx->event_mask = enable ? ctx->event_mask | bit : ctx->event_mask & ~bit;
pthread_mutex_unlock(&ctx->lock);
return 0;
}
mpv_event *mpv_wait_event(mpv_handle *ctx, double timeout)
{
mpv_event *event = ctx->cur_event;
struct timespec deadline = mpthread_get_deadline(timeout);
pthread_mutex_lock(&ctx->lock);
*event = (mpv_event){0};
talloc_free_children(event);
while (1) {
if (mp_ring_buffered(ctx->events)) {
int r =
mp_ring_read(ctx->events, (unsigned char*)event, sizeof(*event));
if (r != sizeof(*event))
abort();
talloc_steal(event, event->data);
break;
}
if (ctx->shutdown) {
event->event_id = MPV_EVENT_SHUTDOWN;
break;
}
if (ctx->messages) {
// Poll the log message queue. Currently we can't/don't do better.
struct mp_log_buffer_entry *msg =
mp_msg_log_buffer_read(ctx->messages);
if (msg) {
event->event_id = MPV_EVENT_LOG_MESSAGE;
struct mpv_event_log_message *cmsg = talloc_ptrtype(event, cmsg);
*cmsg = (struct mpv_event_log_message){
.prefix = talloc_steal(event, msg->prefix),
.level = mp_log_levels[msg->level],
.text = talloc_steal(event, msg->text),
};
event->data = cmsg;
talloc_free(msg);
break;
}
}
if (ctx->queued_wakeup)
break;
if (timeout <= 0)
break;
pthread_cond_timedwait(&ctx->wakeup, &ctx->lock, &deadline);
}
ctx->queued_wakeup = false;
pthread_mutex_unlock(&ctx->lock);
return event;
}
void mpv_wakeup(mpv_handle *ctx)
{
pthread_mutex_lock(&ctx->lock);
ctx->queued_wakeup = true;
wakeup_client(ctx);
pthread_mutex_unlock(&ctx->lock);
}
int mpv_set_option(mpv_handle *ctx, const char *name, mpv_format format,
void *data)
{
if (ctx->mpctx->initialized) {
char prop[100];
snprintf(prop, sizeof(prop), "options/%s", name);
int err = mpv_set_property(ctx, name, format, data);
switch (err) {
case MPV_ERROR_PROPERTY_UNAVAILABLE:
case MPV_ERROR_PROPERTY_ERROR:
return MPV_ERROR_OPTION_ERROR;
case MPV_ERROR_PROPERTY_FORMAT:
return MPV_ERROR_OPTION_FORMAT;
case MPV_ERROR_PROPERTY_NOT_FOUND:
return MPV_ERROR_OPTION_NOT_FOUND;
default:
return err;
}
} else {
if (format != MPV_FORMAT_STRING)
return MPV_ERROR_OPTION_FORMAT;
const char *value = data;
int err = m_config_set_option0(ctx->mpctx->mconfig, name, value);
switch (err) {
case M_OPT_MISSING_PARAM:
case M_OPT_INVALID:
case M_OPT_OUT_OF_RANGE:
return MPV_ERROR_OPTION_ERROR;
case M_OPT_UNKNOWN:
return MPV_ERROR_OPTION_NOT_FOUND;
default:
if (err >= 0)
return 0;
return MPV_ERROR_OPTION_ERROR;
}
}
}
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);
}
// Run a command in the playback thread.
// Note: once some things are fixed (like vo_opengl not being safe to be
// called from any thread other than the playback thread), this can
// be replaced by a simpler method.
static void run_locked(mpv_handle *ctx, void (*fn)(void *fn_data), void *fn_data)
{
mp_dispatch_run(ctx->mpctx->dispatch, fn, fn_data);
}
// Run a command asynchronously. It's the responsibility of the caller to
// actually send the reply. This helper merely saves a small part of the
// required boilerplate to do so.
// fn: callback to execute the request
// fn_data: opaque caller-defined argument for fn. This will be automatically
// freed with talloc_free(fn_data).
static int run_async(mpv_handle *ctx, void (*fn)(void *fn_data), void *fn_data)
{
int err = reserve_reply(ctx);
if (err < 0) {
talloc_free(fn_data);
return err;
}
mp_dispatch_enqueue_autofree(ctx->mpctx->dispatch, fn, fn_data);
return 0;
}
struct cmd_request {
struct MPContext *mpctx;
struct mp_cmd *cmd;
int status;
struct mpv_handle *reply_ctx;
uint64_t userdata;
};
static void cmd_fn(void *data)
{
struct cmd_request *req = data;
run_command(req->mpctx, req->cmd);
req->status = 0;
talloc_free(req->cmd);
if (req->reply_ctx) {
status_reply(req->reply_ctx, MPV_EVENT_COMMAND_REPLY,
req->userdata, req->status);
}
}
static int run_client_command(mpv_handle *ctx, struct mp_cmd *cmd)
{
if (!ctx->mpctx->initialized)
return MPV_ERROR_UNINITIALIZED;
if (!cmd)
return MPV_ERROR_INVALID_PARAMETER;
struct cmd_request req = {
.mpctx = ctx->mpctx,
.cmd = cmd,
};
run_locked(ctx, cmd_fn, &req);
return req.status;
}
int mpv_command(mpv_handle *ctx, const char **args)
{
return run_client_command(ctx, mp_input_parse_cmd_strv(ctx->log, 0, args,
ctx->name));
}
int mpv_command_string(mpv_handle *ctx, const char *args)
{
return run_client_command(ctx,
mp_input_parse_cmd(ctx->mpctx->input, bstr0((char*)args), ctx->name));
}
int mpv_command_async(mpv_handle *ctx, uint64_t ud, const char **args)
{
if (!ctx->mpctx->initialized)
return MPV_ERROR_UNINITIALIZED;
struct mp_cmd *cmd = mp_input_parse_cmd_strv(ctx->log, 0, args, "<client>");
if (!cmd)
return MPV_ERROR_INVALID_PARAMETER;
struct cmd_request *req = talloc_ptrtype(NULL, req);
*req = (struct cmd_request){
.mpctx = ctx->mpctx,
.cmd = cmd,
.reply_ctx = ctx,
.userdata = ud,
};
return run_async(ctx, cmd_fn, req);
}
static int translate_property_error(int errc)
{
switch (errc) {
case M_PROPERTY_OK: return 0;
case M_PROPERTY_ERROR: return MPV_ERROR_PROPERTY_ERROR;
case M_PROPERTY_UNAVAILABLE: return MPV_ERROR_PROPERTY_UNAVAILABLE;
case M_PROPERTY_NOT_IMPLEMENTED: return MPV_ERROR_PROPERTY_ERROR;
case M_PROPERTY_UNKNOWN: return MPV_ERROR_PROPERTY_NOT_FOUND;
// shouldn't happen
default: return MPV_ERROR_PROPERTY_ERROR;
}
}
struct setproperty_request {
struct MPContext *mpctx;
const char *name;
int format;
void *data;
int status;
struct mpv_handle *reply_ctx;
uint64_t userdata;
};
static int property_format_to_set_cmd(int format)
{
switch (format) {
case MPV_FORMAT_STRING: return M_PROPERTY_SET_STRING;
default: return MPV_ERROR_PROPERTY_FORMAT;
}
}
static void setproperty_fn(void *arg)
{
struct setproperty_request *req = arg;
int cmd = property_format_to_set_cmd(req->format);
if (cmd < 0) {
req->status = cmd;
} else {
int err = mp_property_do(req->name, cmd, req->data, req->mpctx);
req->status = translate_property_error(err);
}
if (req->reply_ctx) {
status_reply(req->reply_ctx, MPV_EVENT_SET_PROPERTY_REPLY,
req->userdata, req->status);
}
}
int mpv_set_property(mpv_handle *ctx, const char *name, mpv_format format,
void *data)
{
if (!ctx->mpctx->initialized)
return MPV_ERROR_UNINITIALIZED;
struct setproperty_request req = {
.mpctx = ctx->mpctx,
.name = name,
.format = format,
.data = data,
};
run_locked(ctx, setproperty_fn, &req);
return req.status;
}
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);
}
int mpv_set_property_async(mpv_handle *ctx, uint64_t ud, const char *name,
mpv_format format, void *data)
{
if (!ctx->mpctx->initialized)
return MPV_ERROR_UNINITIALIZED;
struct setproperty_request *req = talloc_ptrtype(NULL, req);
*req = (struct setproperty_request){
.mpctx = ctx->mpctx,
.name = talloc_strdup(req, name),
.format = MPV_FORMAT_STRING,
.data = talloc_strdup(req, data), // for now always a string
.reply_ctx = ctx,
.userdata = ud,
};
return run_async(ctx, setproperty_fn, req);
}
static int property_format_to_get_cmd(int format)
{
switch (format) {
case MPV_FORMAT_STRING: return M_PROPERTY_GET_STRING;
case MPV_FORMAT_OSD_STRING: return M_PROPERTY_PRINT;
default: return MPV_ERROR_PROPERTY_FORMAT;
}
}
struct getproperty_request {
struct MPContext *mpctx;
const char *name;
mpv_format format;
void *data;
int status;
struct mpv_handle *reply_ctx;
uint64_t userdata;
};
static void getproperty_fn(void *arg)
{
struct getproperty_request *req = arg;
char *xdata = NULL; // currently, we support strings only
void *data = req->data ? req->data : &xdata;
int cmd = property_format_to_get_cmd(req->format);
if (cmd < 0) {
req->status = cmd;
} else {
int err = mp_property_do(req->name, cmd, data, req->mpctx);
req->status = translate_property_error(err);
}
if (req->reply_ctx) {
struct mpv_event_property *prop = talloc_ptrtype(NULL, prop);
*prop = (struct mpv_event_property){
.name = talloc_steal(prop, (char *)req->name),
.format = req->format,
.data = talloc_steal(prop, xdata),
};
struct mpv_event reply = {
.event_id = MPV_EVENT_GET_PROPERTY_REPLY,
.data = prop,
.error = req->status,
.reply_userdata = req->userdata,
};
send_reply(req->reply_ctx, req->userdata, &reply);
}
}
int mpv_get_property(mpv_handle *ctx, const char *name, mpv_format format,
void *data)
{
if (!ctx->mpctx->initialized)
return MPV_ERROR_UNINITIALIZED;
struct getproperty_request req = {
.mpctx = ctx->mpctx,
.name = name,
.format = format,
.data = data,
};
run_locked(ctx, getproperty_fn, &req);
return req.status;
}
char *mpv_get_property_string(mpv_handle *ctx, const char *name)
{
char *str = NULL;
mpv_get_property(ctx, name, MPV_FORMAT_STRING, &str);
return str;
}
char *mpv_get_property_osd_string(mpv_handle *ctx, const char *name)
{
char *str = NULL;
mpv_get_property(ctx, name, MPV_FORMAT_OSD_STRING, &str);
return str;
}
int mpv_get_property_async(mpv_handle *ctx, uint64_t ud, const char *name,
mpv_format format)
{
if (!ctx->mpctx->initialized)
return MPV_ERROR_UNINITIALIZED;
struct getproperty_request *req = talloc_ptrtype(NULL, req);
*req = (struct getproperty_request){
.mpctx = ctx->mpctx,
.name = talloc_strdup(req, name),
.format = format,
.reply_ctx = ctx,
.userdata = ud,
};
return run_async(ctx, getproperty_fn, req);
}
int mpv_request_log_messages(mpv_handle *ctx, const char *min_level)
{
int level = -1;
for (int n = 0; n < MSGL_MAX + 1; n++) {
if (mp_log_levels[n] && strcmp(min_level, mp_log_levels[n]) == 0) {
level = n;
break;
}
}
if (level < 0 && strcmp(min_level, "no") != 0)
return MPV_ERROR_INVALID_PARAMETER;
pthread_mutex_lock(&ctx->lock);
if (!ctx->messages)
ctx->messages_level = -1;
if (ctx->messages_level != level) {
mp_msg_log_buffer_destroy(ctx->messages);
ctx->messages = NULL;
if (level >= 0) {
ctx->messages =
mp_msg_log_buffer_new(ctx->mpctx->global, 1000, level);
}
ctx->messages_level = level;
}
pthread_mutex_unlock(&ctx->lock);
return 0;
}
unsigned long mpv_client_api_version(void)
{
return MPV_CLIENT_API_VERSION;
}
static const char *err_table[] = {
[-MPV_ERROR_SUCCESS] = "success",
[-MPV_ERROR_EVENT_QUEUE_FULL] = "event queue full",
[-MPV_ERROR_NOMEM] = "memory allocation failed",
[-MPV_ERROR_UNINITIALIZED] = "core not uninitialized",
[-MPV_ERROR_INVALID_PARAMETER] = "invalid parameter",
[-MPV_ERROR_OPTION_NOT_FOUND] = "option not found",
[-MPV_ERROR_OPTION_FORMAT] = "unsupported format for setting option",
[-MPV_ERROR_OPTION_ERROR] = "error setting option",
[-MPV_ERROR_PROPERTY_NOT_FOUND] = "property not found",
[-MPV_ERROR_PROPERTY_FORMAT] = "unsupported format for setting property",
[-MPV_ERROR_PROPERTY_UNAVAILABLE] = "property unavailable",
[-MPV_ERROR_PROPERTY_ERROR] = "error accessing property",
};
const char *mpv_error_string(int error)
{
error = -error;
if (error < 0)
error = 0;
const char *name = NULL;
if (error < MP_ARRAY_SIZE(err_table))
name = err_table[error];
return name ? name : "unknown error";
}
static const char *event_table[] = {
[MPV_EVENT_NONE] = "none",
[MPV_EVENT_SHUTDOWN] = "shutdown",
[MPV_EVENT_LOG_MESSAGE] = "log-message",
[MPV_EVENT_GET_PROPERTY_REPLY] = "get-property-reply",
[MPV_EVENT_SET_PROPERTY_REPLY] = "set-property-reply",
[MPV_EVENT_COMMAND_REPLY] = "command-reply",
[MPV_EVENT_START_FILE] = "start-file",
[MPV_EVENT_END_FILE] = "end-file",
[MPV_EVENT_PLAYBACK_START] = "playback-start",
[MPV_EVENT_TRACKS_CHANGED] = "tracks-changed",
[MPV_EVENT_TRACK_SWITCHED] = "track-switched",
[MPV_EVENT_IDLE] = "idle",
[MPV_EVENT_PAUSE] = "pause",
[MPV_EVENT_UNPAUSE] = "unpause",
[MPV_EVENT_TICK] = "tick",
[MPV_EVENT_SCRIPT_INPUT_DISPATCH] = "script-input-dispatch",
};
const char *mpv_event_name(mpv_event_id event)
{
if (event < 0 || event >= MP_ARRAY_SIZE(event_table))
return NULL;
return event_table[event];
}
void mpv_free(void *data)
{
talloc_free(data);
}

24
player/client.h Normal file
View File

@ -0,0 +1,24 @@
#ifndef MP_CLIENT_H_
#define MP_CLIENT_H_
#include <stdint.h>
#include "libmpv/client.h"
struct MPContext;
struct mpv_handle;
struct mp_client_api;
struct mp_log;
void mp_clients_init(struct MPContext *mpctx);
void mp_clients_destroy(struct MPContext *mpctx);
int mp_clients_num(struct MPContext *mpctx);
void mp_client_broadcast_event(struct MPContext *mpctx, int event, void *data);
int mp_client_send_event(struct MPContext *mpctx, const char *client_name,
int event, void *data);
struct mpv_handle *mp_new_client(struct mp_client_api *clients, const char *name);
struct mp_log *mp_client_get_log(struct mpv_handle *ctx);
#endif

29
player/command.c
View File

@ -30,6 +30,7 @@
#include "config.h"
#include "talloc.h"
#include "client.h"
#include "common/msg.h"
#include "common/msg_control.h"
#include "command.h"
@ -3178,16 +3179,14 @@ void command_init(struct MPContext *mpctx)
};
}
// Notify that a property might have changed.
void mp_notify_property(struct MPContext *mpctx, const char *property)
{
mp_notify(mpctx, MP_EVENT_PROPERTY, (void *)property);
}
void mp_notify(struct MPContext *mpctx, enum mp_event event, void *arg)
void mp_notify(struct MPContext *mpctx, int event, void *arg)
{
struct command_ctx *ctx = mpctx->command_ctx;
ctx->events |= 1u << event;
if (event == MPV_EVENT_START_FILE)
ctx->last_seek_pts = MP_NOPTS_VALUE;
mp_client_broadcast_event(mpctx, event, arg);
}
static void handle_script_event(struct MPContext *mpctx, const char *name,
@ -3202,10 +3201,10 @@ void mp_flush_events(struct MPContext *mpctx)
{
struct command_ctx *ctx = mpctx->command_ctx;
ctx->events |= (1u << MP_EVENT_TICK);
ctx->events |= (1u << MPV_EVENT_TICK);
for (int n = 0; n < 16; n++) {
enum mp_event event = n;
int event = n;
unsigned mask = 1 << event;
if (ctx->events & mask) {
// The event handler could set event flags again; in this case let
@ -3213,17 +3212,15 @@ void mp_flush_events(struct MPContext *mpctx)
ctx->events &= ~mask;
const char *name = NULL;
switch (event) {
case MP_EVENT_TICK: name = "tick"; break;
case MP_EVENT_TRACKS_CHANGED: name = "track-layout"; break;
case MP_EVENT_PLAYBACK_START: name = "playback-start"; break;
case MP_EVENT_START_FILE: name = "start"; break;
case MP_EVENT_END_FILE: name = "end"; break;
case MPV_EVENT_TICK: name = "tick"; break;
case MPV_EVENT_TRACKS_CHANGED: name = "track-layout"; break;
case MPV_EVENT_PLAYBACK_START: name = "playback-start"; break;
case MPV_EVENT_START_FILE: name = "start"; break;
case MPV_EVENT_END_FILE: name = "end"; break;
default: ;
}
if (name)
handle_script_event(mpctx, name, "");
if (event == MP_EVENT_START_FILE)
ctx->last_seek_pts = MP_NOPTS_VALUE;
}
}
}

14
player/command.h
View File

@ -34,19 +34,7 @@ int mp_property_do(const char* name, int action, void* val,
const struct m_option *mp_get_property_list(void);
enum mp_event {
MP_EVENT_NONE,
MP_EVENT_TICK,
MP_EVENT_PROPERTY, // char*, property that is changed
MP_EVENT_TRACKS_CHANGED,
MP_EVENT_START_FILE,
MP_EVENT_PLAYBACK_START,
MP_EVENT_END_FILE,
};
void mp_notify(struct MPContext *mpctx, enum mp_event event, void *arg);
void mp_notify_property(struct MPContext *mpctx, const char *property);
void mp_notify(struct MPContext *mpctx, int event, void *arg);
void mp_flush_events(struct MPContext *mpctx);
#endif /* MPLAYER_COMMAND_H */

9
player/core.h
View File

@ -140,12 +140,16 @@ enum {
#define NUM_PTRACKS 2
typedef struct MPContext {
bool initialized;
struct mpv_global *global;
struct MPOpts *opts;
struct mp_log *log;
struct mp_log *statusline;
struct m_config *mconfig;
struct input_ctx *input;
struct mp_client_api *clients;
struct mp_dispatch_queue *dispatch;
struct mp_log *statusline;
struct osd_state *osd;
struct mp_osd_msg *osd_msg_stack;
char *term_osd_text;
@ -385,6 +389,9 @@ void mp_set_playlist_entry(struct MPContext *mpctx, struct playlist_entry *e);
void mp_play_files(struct MPContext *mpctx);
// main.c
int mp_initialize(struct MPContext *mpctx);
struct MPContext *mp_create(void);
void mp_destroy(struct MPContext *mpctx);
void mp_print_version(struct mp_log *log, int always);
// misc.c

19
player/loadfile.c
View File

@ -57,6 +57,7 @@
#include "core.h"
#include "command.h"
#include "libmpv/client.h"
#if HAVE_DVBIN
#include "stream/dvbin.h"
@ -470,7 +471,7 @@ static struct track *add_stream_track(struct MPContext *mpctx,
demuxer_select_track(track->demuxer, stream, false);
mp_notify(mpctx, MP_EVENT_TRACKS_CHANGED, NULL);
mp_notify(mpctx, MPV_EVENT_TRACKS_CHANGED, NULL);
return track;
}
@ -503,7 +504,7 @@ static void add_dvd_tracks(struct MPContext *mpctx)
stream_control(stream, STREAM_CTRL_GET_LANG, &req);
track->lang = talloc_strdup(track, req.name);
mp_notify(mpctx, MP_EVENT_TRACKS_CHANGED, NULL);
mp_notify(mpctx, MPV_EVENT_TRACKS_CHANGED, NULL);
}
}
demuxer_enable_autoselect(demuxer);
@ -666,15 +667,12 @@ void mp_switch_track_n(struct MPContext *mpctx, int order, enum stream_type type
if (type == STREAM_VIDEO) {
mpctx->opts->video_id = user_tid;
reinit_video_chain(mpctx);
mp_notify_property(mpctx, "vid");
} else if (type == STREAM_AUDIO) {
mpctx->opts->audio_id = user_tid;
reinit_audio_chain(mpctx);
mp_notify_property(mpctx, "aid");
} else if (type == STREAM_SUB) {
mpctx->opts->sub_id = user_tid;
reinit_subs(mpctx, 0);
mp_notify_property(mpctx, "sid");
}
} else if (order == 1) {
if (type == STREAM_SUB) {
@ -683,6 +681,7 @@ void mp_switch_track_n(struct MPContext *mpctx, int order, enum stream_type type
}
}
mp_notify(mpctx, MPV_EVENT_TRACK_SWITCHED, NULL);
osd_changed_all(mpctx->osd);
talloc_free(mpctx->track_layout_hash);
@ -738,7 +737,7 @@ bool mp_remove_track(struct MPContext *mpctx, struct track *track)
mpctx->num_tracks--;
talloc_free(track);
mp_notify(mpctx, MP_EVENT_TRACKS_CHANGED, NULL);
mp_notify(mpctx, MPV_EVENT_TRACKS_CHANGED, NULL);
return true;
}
@ -1052,7 +1051,7 @@ static void play_current_file(struct MPContext *mpctx)
mpctx->initialized_flags |= INITIALIZED_PLAYBACK;
mp_notify(mpctx, MP_EVENT_START_FILE, NULL);
mp_notify(mpctx, MPV_EVENT_START_FILE, NULL);
mp_flush_events(mpctx);
mpctx->stop_play = 0;
@ -1345,7 +1344,7 @@ goto_reopen_demuxer: ;
if (mpctx->opts->pause)
pause_player(mpctx);
mp_notify(mpctx, MP_EVENT_PLAYBACK_START, NULL);
mp_notify(mpctx, MPV_EVENT_PLAYBACK_START, NULL);
playback_start = mp_time_sec();
mpctx->error_playing = false;
@ -1410,8 +1409,8 @@ terminate_playback: // don't jump here after ao/vo/getch initialization!
mpctx->playlist->current->init_failed = init_failed;
}
mp_notify(mpctx, MP_EVENT_TRACKS_CHANGED, NULL);
mp_notify(mpctx, MP_EVENT_END_FILE, NULL);
mp_notify(mpctx, MPV_EVENT_TRACKS_CHANGED, NULL);
mp_notify(mpctx, MPV_EVENT_END_FILE, NULL);
mp_flush_events(mpctx);
}

258
player/main.c
View File

@ -31,6 +31,7 @@
#include "osdep/priority.h"
#include "osdep/terminal.h"
#include "osdep/timer.h"
#include "osdep/threads.h"
#include "common/av_log.h"
#include "common/codecs.h"
@ -61,6 +62,7 @@
#include "video/out/vo.h"
#include "core.h"
#include "client.h"
#include "lua.h"
#include "command.h"
#include "screenshot.h"
@ -89,6 +91,8 @@
#endif
#endif
static bool terminal_initialized;
const char mp_help_text[] =
"Usage: mpv [options] [url|path/]filename\n"
"\n"
@ -113,11 +117,20 @@ void mp_print_version(struct mp_log *log, int always)
mp_msg(log, v, "\n");
}
static MP_NORETURN void exit_player(struct MPContext *mpctx,
enum exit_reason how)
static void shutdown_clients(struct MPContext *mpctx)
{
int rc;
uninit_player(mpctx, INITIALIZED_ALL);
while (mpctx->clients && mp_clients_num(mpctx)) {
mp_client_broadcast_event(mpctx, MPV_EVENT_SHUTDOWN, NULL);
mp_dispatch_queue_process(mpctx->dispatch, 0);
mp_input_get_cmd(mpctx->input, 100, 1);
}
mp_clients_destroy(mpctx);
}
void mp_destroy(struct MPContext *mpctx)
{
if (mpctx->initialized)
uninit_player(mpctx, INITIALIZED_ALL);
#if HAVE_ENCODING
encode_lavc_finish(mpctx->encode_lavc_ctx);
@ -129,10 +142,7 @@ static MP_NORETURN void exit_player(struct MPContext *mpctx,
#if HAVE_LUA
mp_lua_uninit(mpctx);
#endif
#if HAVE_COCOA
cocoa_set_input_context(NULL);
#endif
shutdown_clients(mpctx);
command_uninit(mpctx);
@ -141,14 +151,27 @@ static MP_NORETURN void exit_player(struct MPContext *mpctx,
osd_free(mpctx->osd);
#if HAVE_LIBASS
ass_library_done(mpctx->ass_library);
mpctx->ass_library = NULL;
if (mpctx->ass_library)
ass_library_done(mpctx->ass_library);
#endif
if (mpctx->opts->use_terminal)
getch2_disable();
uninit_libav(mpctx->global);
mp_msg_uninit(mpctx->global);
talloc_free(mpctx);
}
static MP_NORETURN void exit_player(struct MPContext *mpctx,
enum exit_reason how)
{
int rc;
#if HAVE_COCOA
cocoa_set_input_context(NULL);
#endif
if (how != EXIT_NONE) {
const char *reason;
switch (how) {
@ -183,11 +206,7 @@ static MP_NORETURN void exit_player(struct MPContext *mpctx,
}
}
// must be last since e.g. mp_msg uses option values
// that will be freed by this.
mp_msg_uninit(mpctx->global);
talloc_free(mpctx);
mp_destroy(mpctx);
#if HAVE_COCOA
terminate_cocoa_application();
@ -284,8 +303,6 @@ static void osdep_preinit(int *p_argc, char ***p_argv)
if (pSetSearchPathMode)
pSetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE);
#endif
mp_time_init();
}
static int cfg_include(void *ctx, char *filename, int flags)
@ -294,14 +311,10 @@ static int cfg_include(void *ctx, char *filename, int flags)
return m_config_parse_config_file(mpctx->mconfig, filename, flags);
}
static int mpv_main(int argc, char *argv[])
struct MPContext *mp_create(void)
{
osdep_preinit(&argc, &argv);
if (argc >= 1) {
argc--;
argv++;
}
mp_time_init();
GetCpuCaps(&gCpuCaps);
struct MPContext *mpctx = talloc(NULL, MPContext);
*mpctx = (struct MPContext){
@ -309,6 +322,7 @@ static int mpv_main(int argc, char *argv[])
.term_osd_contents = talloc_strdup(mpctx, ""),
.osd_progbar = { .type = -1 },
.playlist = talloc_struct(mpctx, struct playlist, {0}),
.dispatch = mp_dispatch_create(mpctx),
};
mpctx->global = talloc_zero(mpctx, struct mpv_global);
@ -331,8 +345,119 @@ static int mpv_main(int argc, char *argv[])
mpctx->mconfig->use_profiles = true;
mpctx->mconfig->is_toplevel = true;
mpctx->global->opts = mpctx->opts;
screenshot_init(mpctx);
mpctx->mixer = mixer_init(mpctx, mpctx->global);
command_init(mpctx);
init_libav(mpctx->global);
mp_clients_init(mpctx);
return mpctx;
}
// Finish mpctx initialization. This must be done after setting up all options.
// Some of the initializations depend on the options, and can't be changed or
// undone later.
// cplayer: true if called by the command line player, false for client API
// Returns: <0 on error, 0 on success.
int mp_initialize(struct MPContext *mpctx)
{
struct MPOpts *opts = mpctx->opts;
assert(!mpctx->initialized);
if (mpctx->opts->use_terminal && !terminal_initialized) {
terminal_initialized = true;
terminal_init();
}
mpctx->input = mp_input_init(mpctx->global);
stream_set_interrupt_callback(mp_input_check_interrupt, mpctx->input);
#if HAVE_ENCODING
if (opts->encode_output.file && *opts->encode_output.file) {
mpctx->encode_lavc_ctx = encode_lavc_init(&opts->encode_output,
mpctx->global);
if(!mpctx->encode_lavc_ctx) {
MP_INFO(mpctx, "Encoding initialization failed.");
return -1;
}
m_config_set_option0(mpctx->mconfig, "vo", "lavc");
m_config_set_option0(mpctx->mconfig, "ao", "lavc");
m_config_set_option0(mpctx->mconfig, "fixed-vo", "yes");
m_config_set_option0(mpctx->mconfig, "force-window", "no");
m_config_set_option0(mpctx->mconfig, "gapless-audio", "yes");
mp_input_enable_section(mpctx->input, "encode", MP_INPUT_EXCLUSIVE);
}
#endif
if (opts->use_terminal) {
if (mpctx->opts->slave_mode)
terminal_setup_stdin_cmd_input(mpctx->input);
else if (mpctx->opts->consolecontrols)
terminal_setup_getch(mpctx->input);
if (opts->consolecontrols)
getch2_enable();
}
#if HAVE_LIBASS
mpctx->ass_log = mp_log_new(mpctx, mpctx->global->log, "!libass");
mpctx->ass_library = mp_ass_init(mpctx->global, mpctx->ass_log);
#else
MP_WARN(mpctx, "Compiled without libass.\n");
MP_WARN(mpctx, "There will be no OSD and no text subtitles.\n");
#endif
mpctx->osd = osd_create(mpctx->global);
// From this point on, all mpctx members are initialized.
mpctx->initialized = true;
if (opts->force_vo) {
opts->fixed_vo = 1;
mpctx->video_out = init_best_video_out(mpctx->global, mpctx->input,
mpctx->encode_lavc_ctx);
if (!mpctx->video_out) {
MP_FATAL(mpctx, "Error opening/initializing "
"the selected video_out (-vo) device.\n");
return -1;
}
mpctx->mouse_cursor_visible = true;
mpctx->initialized_flags |= INITIALIZED_VO;
}
#if HAVE_LUA
// Lua user scripts can call arbitrary functions. Load them at a point
// where this is safe.
mp_lua_init(mpctx);
#endif
if (opts->shuffle)
playlist_shuffle(mpctx->playlist);
if (opts->merge_files)
merge_playlist_files(mpctx->playlist);
mpctx->playlist->current = mp_check_playlist_resume(mpctx, mpctx->playlist);
if (!mpctx->playlist->current)
mpctx->playlist->current = mpctx->playlist->first;
return 0;
}
static int mpv_main(int argc, char *argv[])
{
osdep_preinit(&argc, &argv);
if (argc >= 1) {
argc--;
argv++;
}
struct MPContext *mpctx = mp_create();
struct MPOpts *opts = mpctx->opts;
mpctx->global->opts = opts;
char *verbose_env = getenv("MPV_VERBOSE");
if (verbose_env)
@ -341,16 +466,12 @@ static int mpv_main(int argc, char *argv[])
// Preparse the command line
m_config_preparse_command_line(mpctx->mconfig, mpctx->global, argc, argv);
mp_msg_update_msglevels(mpctx->global);
if (opts->use_terminal)
if (mpctx->opts->use_terminal && !terminal_initialized) {
terminal_initialized = true;
terminal_init();
}
init_libav(mpctx->global);
GetCpuCaps(&gCpuCaps);
screenshot_init(mpctx);
mpctx->mixer = mixer_init(mpctx, mpctx->global);
command_init(mpctx);
mp_msg_update_msglevels(mpctx->global);
mp_print_version(mpctx->log, false);
@ -388,78 +509,13 @@ static int mpv_main(int argc, char *argv[])
set_priority();
#endif
mpctx->input = mp_input_init(mpctx->global);
stream_set_interrupt_callback(mp_input_check_interrupt, mpctx->input);
if (mp_initialize(mpctx) < 0)
exit_player(mpctx, EXIT_ERROR);
#if HAVE_COCOA
cocoa_set_input_context(mpctx->input);
#endif
#if HAVE_ENCODING
if (opts->encode_output.file && *opts->encode_output.file) {
mpctx->encode_lavc_ctx = encode_lavc_init(&opts->encode_output,
mpctx->global);
if(!mpctx->encode_lavc_ctx) {
MP_INFO(mpctx, "Encoding initialization failed.");
exit_player(mpctx, EXIT_ERROR);
}
m_config_set_option0(mpctx->mconfig, "vo", "lavc");
m_config_set_option0(mpctx->mconfig, "ao", "lavc");
m_config_set_option0(mpctx->mconfig, "fixed-vo", "yes");
m_config_set_option0(mpctx->mconfig, "force-window", "no");
m_config_set_option0(mpctx->mconfig, "gapless-audio", "yes");
mp_input_enable_section(mpctx->input, "encode", MP_INPUT_EXCLUSIVE);
}
#endif
if (opts->use_terminal) {
if (mpctx->opts->slave_mode)
terminal_setup_stdin_cmd_input(mpctx->input);
else if (mpctx->opts->consolecontrols)
terminal_setup_getch(mpctx->input);
if (opts->consolecontrols)
getch2_enable();
}
#if HAVE_LIBASS
mpctx->ass_log = mp_log_new(mpctx, mpctx->global->log, "!libass");
mpctx->ass_library = mp_ass_init(mpctx->global, mpctx->ass_log);
#else
MP_WARN(mpctx, "Compiled without libass.\n");
MP_WARN(mpctx, "There will be no OSD and no text subtitles.\n");
#endif
mpctx->osd = osd_create(mpctx->global);
if (opts->force_vo) {
opts->fixed_vo = 1;
mpctx->video_out = init_best_video_out(mpctx->global, mpctx->input,
mpctx->encode_lavc_ctx);
if (!mpctx->video_out) {
MP_FATAL(mpctx, "Error opening/initializing "
"the selected video_out (-vo) device.\n");
exit_player(mpctx, EXIT_ERROR);
}
mpctx->mouse_cursor_visible = true;
mpctx->initialized_flags |= INITIALIZED_VO;
}
#if HAVE_LUA
// Lua user scripts can call arbitrary functions. Load them at a point
// where this is safe.
mp_lua_init(mpctx);
#endif
if (opts->shuffle)
playlist_shuffle(mpctx->playlist);
if (opts->merge_files)
merge_playlist_files(mpctx->playlist);
mpctx->playlist->current = mp_check_playlist_resume(mpctx, mpctx->playlist);
if (!mpctx->playlist->current)
mpctx->playlist->current = mpctx->playlist->first;
mp_play_files(mpctx);
exit_player(mpctx, mpctx->stop_play == PT_QUIT ? EXIT_QUIT : mpctx->quit_player_rc);

15
player/playloop.c
View File

@ -34,6 +34,7 @@
#include "input/input.h"
#include "osdep/terminal.h"
#include "osdep/threads.h"
#include "osdep/timer.h"
#include "audio/mixer.h"
@ -50,6 +51,7 @@
#include "core.h"
#include "screenshot.h"
#include "command.h"
#include "libmpv/client.h"
#define WAKEUP_PERIOD 0.5
@ -79,7 +81,7 @@ static const char av_desync_help_text[] =
void pause_player(struct MPContext *mpctx)
{
mp_notify_property(mpctx, "pause");
mp_notify(mpctx, MPV_EVENT_PAUSE, NULL);
mpctx->opts->pause = 1;
@ -110,7 +112,7 @@ void pause_player(struct MPContext *mpctx)
void unpause_player(struct MPContext *mpctx)
{
mp_notify_property(mpctx, "pause");
mp_notify(mpctx, MPV_EVENT_UNPAUSE, NULL);
mpctx->opts->pause = 0;
@ -749,12 +751,14 @@ static void handle_input_and_seek_coalesce(struct MPContext *mpctx)
mp_cmd_t *cmd;
while ((cmd = mp_input_get_cmd(mpctx->input, 0, 1)) != NULL) {
mp_dispatch_queue_process(mpctx->dispatch, 0);
cmd = mp_input_get_cmd(mpctx->input, 0, 0);
run_command(mpctx, cmd);
mp_cmd_free(cmd);
if (mpctx->stop_play)
break;
}
mp_dispatch_queue_process(mpctx->dispatch, 0);
}
void add_frame_pts(struct MPContext *mpctx, double pts)
@ -1166,9 +1170,14 @@ void run_playloop(struct MPContext *mpctx)
screenshot_flip(mpctx);
new_frame_shown = true;
mp_notify(mpctx, MPV_EVENT_TICK, NULL);
break;
} // video
if (!video_left || mpctx->paused)
mp_notify(mpctx, MPV_EVENT_TICK, NULL);
video_left &= mpctx->sync_audio_to_video; // force no-video semantics
if (mpctx->d_audio && (mpctx->restart_playback ? !video_left :
@ -1308,6 +1317,7 @@ void run_playloop(struct MPContext *mpctx)
void idle_loop(struct MPContext *mpctx)
{
// ================= idle loop (STOP state) =========================
mp_notify(mpctx, MPV_EVENT_IDLE, NULL);
bool need_reinit = true;
while (mpctx->opts->player_idle_mode && !mpctx->playlist->current
&& mpctx->stop_play != PT_QUIT)
@ -1331,6 +1341,7 @@ void idle_loop(struct MPContext *mpctx)
run_command(mpctx, cmd);
mp_cmd_free(cmd);
mp_flush_events(mpctx);
mp_dispatch_queue_process(mpctx->dispatch, 0);
if (mpctx->opts->use_terminal)
getch2_poll();
}

1
wscript_build.py
View File

@ -202,6 +202,7 @@ def build(ctx):
## Player
( "player/audio.c" ),
( "player/client.c" ),
( "player/command.c" ),
( "player/configfiles.c" ),
( "player/dvdnav.c" ),