GhostNaN
commented
2 years ago Thanks for reporting this, but unfortunately this won't work for many reasons. As I will show: https://github.com/GhostNaN/mpvpaper/blob/d3d58fb8f28e15c41cb1ec54faad45b351526cf5/src/main.c#L375-L378 At least on my PC, when mpvpaper first runs it thinks it's in a idle state at start. So it immediately quits because of this. (This behavior was not there before) Even if try to get around that obstacle by clearing the event buffers it won't quit on idle. Even MPV_EVENT_SHUTDOWN is acting a little weird now.
https://github.com/GhostNaN/mpvpaper/blob/d3d58fb8f28e15c41cb1ec54faad45b351526cf5/src/main.c#L391-L392
This is also not where it should be, as this is how the other pthreads unpause mpv after pausing them for either a watch list or automatically. It should be just before pthread_usleep(10000);.
https://github.com/GhostNaN/mpvpaper/blob/d3d58fb8f28e15c41cb1ec54faad45b351526cf5/src/main.c#L380
Did you mean "pause" not "paused"? if (mpv_get_property(mpv, "pause", MPV_FORMAT_FLAG, &mpv_paused) < 0) {
Lastly a small nit pick, using a switch case for 2 cases is unneeded a "if" and "else if" is fine here.
The code so far:
static void *handle_mpv_events() {
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
bool mpv_paused = 0;
time_t start_time = time(NULL);
const int MPV_OBSERVE_IDLE = 1;
const int MPV_OBSERVE_PAUSE = 2;
mpv_observe_property(mpv, MPV_OBSERVE_IDLE, "idle-active", MPV_FORMAT_NONE);
mpv_observe_property(mpv, MPV_OBSERVE_PAUSE, "pause", MPV_FORMAT_FLAG);
// Clear all events
mpv_event* event = mpv_wait_event(mpv, 1);
while (event->event_id != MPV_EVENT_NONE){
event = mpv_wait_event(mpv, 1);
}
while (!halt_info.kill_render_loop) {
if (SLIDESHOW_TIME) {
if ((time(NULL) - start_time) >= SLIDESHOW_TIME) {
mpv_command_async(mpv, 0, (const char*[]) {"playlist-next", NULL});
start_time = time(NULL);
}
}
mpv_event* event = mpv_wait_event(mpv, 0);
if (event->event_id == MPV_EVENT_SHUTDOWN)
exit_mpvpaper(0);
else if (event->event_id == MPV_EVENT_PROPERTY_CHANGE) {
if (event->reply_userdata == MPV_OBSERVE_IDLE) {
exit_mpvpaper(0);
}
if (event->reply_userdata == MPV_OBSERVE_PAUSE) {
mpv_get_property(mpv, "pause", MPV_FORMAT_FLAG, &mpv_paused);
if (mpv_paused) {
// User paused
if (!halt_info.is_paused)
halt_info.is_paused += 1;
} else {
halt_info.is_paused = 0;
}
}
}
if (!halt_info.is_paused && mpv_paused) {
mpv_command_async(mpv, 0, (const char*[]) {"set", "pause", "no", NULL});
}
pthread_usleep(10000);
}
mpv_unobserve_property(mpv, MPV_OBSERVE_IDLE);
mpv_unobserve_property(mpv, MPV_OBSERVE_PAUSE);
pthread_exit(NULL);
}I threw MPV_OBSERVE_IDLE and MPV_OBSERVE_PAUSE in there as well, because they won't be used outside of this function. The idea is sound, but getting to work 100% is another matter. I don't know if it's my terrible code full of race conditions or mpv being finicky for some reason. Either way more needs to be done before this can be committed, either on my end or yours (or mpv?).
Sorry for the long comment, thanks again for bring this to my attention. I appreciate the attempt.
easyteacher
Register observers as
MPV_EVENT_IDLEis deprecated andMPV_EVENT_PAUSE/MPV_EVENT_UNPAUSEhave been removed.See also: https://github.com/mpv-player/mpv/pull/9541