diff --git a/tests/test_android_stream.c b/tests/test_android_stream.c index 2826ab62..49416a27 100644 --- a/tests/test_android_stream.c +++ b/tests/test_android_stream.c @@ -69,8 +69,8 @@ int main(void) { CHECK(!stream_service_needs_activity(inst)); CHECK(android_stream_open(1, group, 0, 1280, 720, 90, 1, 0) == 0); size_t size = 0; u_free(wait_event(1, 4, &size)); - char *sources = android_stream_sources(group); u_free(sources); test_clock_poll(ua, 100); - sources = android_stream_sources(group); CHECK(strstr(sources, "epoch") && strstr(sources, "name")); u_free(sources); + char *sources = NULL; CHECK(stream_sources_json(inst, group, &sources) == STREAM_OK); + CHECK(strstr(sources, "epoch") && strstr(sources, "name")); u_free(sources); test_clock_poll(ua, 100); CHECK(source_events == 2 && strstr(source_snapshot, "epoch")); struct stream_member_state member; CHECK(stream_member_load(inst, group, inst->node_id, &member, NULL) == STREAM_OK && member.published); diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/data/NativeLib.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/NativeLib.kt index eda6c8b5..a29cadab 100644 --- a/tools/chatgui-android/app/src/main/java/com/utun/chat/data/NativeLib.kt +++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/data/NativeLib.kt @@ -205,7 +205,6 @@ object NativeLib { fun streamFeed(id: Long, video: Boolean, pts: Long, key: Boolean, data: ByteArray): Int = nativeStreamFeed(id, video, pts, key, data) fun streamStop(id: Long) { nativeStreamStop(id) } fun streamPull(id: Long): ByteArray? = nativeStreamPull(id) - fun streamSources(group: Long): String = nativeStreamSources(group) ?: "[]" fun streamOpusCreate(encode: Boolean): Long = nativeStreamOpusCreate(encode) fun streamOpusEncode(handle: Long, pcm: ShortArray): ByteArray? = nativeStreamOpusEncode(handle, pcm) fun streamOpusDecode(handle: Long, packet: ByteArray): ShortArray? = nativeStreamOpusDecode(handle, packet) @@ -216,7 +215,6 @@ object NativeLib { private external fun nativeStreamFeed(id: Long, video: Boolean, pts: Long, key: Boolean, data: ByteArray): Int private external fun nativeStreamStop(id: Long) private external fun nativeStreamPull(id: Long): ByteArray? - private external fun nativeStreamSources(group: Long): String? private external fun nativeStreamOpusCreate(encode: Boolean): Long private external fun nativeStreamOpusEncode(handle: Long, pcm: ShortArray): ByteArray? private external fun nativeStreamOpusDecode(handle: Long, packet: ByteArray): ShortArray? diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/StreamScreen.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/StreamScreen.kt index 28837a4e..5df6a9ae 100644 --- a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/StreamScreen.kt +++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/StreamScreen.kt @@ -28,15 +28,10 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import com.utun.chat.R import com.utun.chat.data.LogManager -import com.utun.chat.data.NativeLib import com.utun.chat.data.StreamController import com.utun.chat.data.StreamPhase import com.utun.chat.data.StreamPlayerEngine import com.utun.chat.data.StreamSource -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay -import kotlinx.coroutines.withContext -import org.json.JSONArray /** Выход с экрана закрывает только reader; foreground publisher останавливает явная кнопка/notification. */ @OptIn(ExperimentalMaterial3Api::class)