Skip to content

Pass MPVNode to event #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abdallahmehiz merged 1 commit into from
Sep 30, 2025
Merged

Pass MPVNode to event #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/is/xyz/mpv/MPVLib.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ object MPVLib {
}

@JvmStatic
fun event(eventId: Int) {
fun event(eventId: Int, data: MPVNode) {
synchronized(observers) {
for (o in observers) o.event(eventId)
for (o in observers) o.event(eventId, data)
}
scope.launch { eventFlow.emit(eventId) }
}
Expand Down Expand Up @@ -215,7 +215,7 @@ object MPVLib {
fun eventProperty(property: String, value: String)
fun eventProperty(property: String, value: Double)
fun eventProperty(property: String, value: MPVNode)
fun event(eventId: Int)
fun event(eventId: Int, data: MPVNode)
}

interface LogObserver {
Expand Down
13 changes: 10 additions & 3 deletions app/src/main/jni/event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,13 @@ static void sendPropertyUpdateToJava(JNIEnv *env, mpv_event_property *prop)
env->DeleteLocalRef(jvalue);
}

static void sendEventToJava(JNIEnv *env, int event)
static void sendEventToJava(JNIEnv *env, int event, mpv_node *event_node)
{
env->CallStaticVoidMethod(mpv_MPVLib, mpv_MPVLib_event, event);
jobject jnode = mpv_node_to_jobject(env, event_node);
if (jnode) {
env->CallStaticVoidMethod(mpv_MPVLib, mpv_MPVLib_event, event, jnode);
env->DeleteLocalRef(jnode);
}
}

static void sendLogMessageToJava(JNIEnv *env, mpv_event_log_message *msg)
Expand Down Expand Up @@ -112,7 +116,10 @@ void *event_thread(void *arg)
break;
default:
ALOGV("event: %s\n", mpv_event_name(mp_event->event_id));
sendEventToJava(env, mp_event->event_id);
mpv_node event_node;
mpv_event_to_node(&event_node, mp_event);
sendEventToJava(env, mp_event->event_id, &event_node);
mpv_free_node_contents(&event_node);
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/jni/jni_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void init_methods_cache(JNIEnv *env)
mpv_MPVLib_eventProperty_Sd = env->GetStaticMethodID(mpv_MPVLib, "eventProperty", "(Ljava/lang/String;D)V"); // eventProperty(String, double)
mpv_MPVLib_eventProperty_SS = env->GetStaticMethodID(mpv_MPVLib, "eventProperty", "(Ljava/lang/String;Ljava/lang/String;)V"); // eventProperty(String, String)
mpv_MPVLib_eventProperty_SN = env->GetStaticMethodID(mpv_MPVLib, "eventProperty", "(Ljava/lang/String;Lis/xyz/mpv/MPVNode;)V"); // eventProperty(String, MPVNode)
mpv_MPVLib_event = env->GetStaticMethodID(mpv_MPVLib, "event", "(I)V"); // event(int)
mpv_MPVLib_event = env->GetStaticMethodID(mpv_MPVLib, "event", "(ILis/xyz/mpv/MPVNode;)V"); // event(int, MPVNode)
mpv_MPVLib_logMessage_SiS = env->GetStaticMethodID(mpv_MPVLib, "logMessage", "(Ljava/lang/String;ILjava/lang/String;)V"); // logMessage(String, int, String)

// for array node creation, tbh, it might be better to use "List" instead but i wanted consitent naming
Expand Down