react-native-queue-player 1.1.2 → 2.0.0

package/QueuePlayer.podspec

@@ -10,7 +10,10 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported }
+  # Declared explicitly rather than inherited from
+  # `min_ios_version_supported`, which resolves lower: AVPlayer and
+  # AVPlayerItem only drop their main-thread requirement at iOS 16.
+  s.platforms    = { :ios => '16.0' }
   s.source       = { :git => "https://github.com/ghenry22/react-native-queue-player.git", :tag => "#{s.version}" }
 
   # NOTE on cross-pod consumer-Swift access:
@@ -64,11 +67,11 @@ Pod::Spec.new do |s|
 
   # Opt-in Chromecast subspec. Consumer Podfile adds:
   #   pod 'QueuePlayer/Chromecast', :path => '...'
-  # alongside the default `pod 'QueuePlayer'`. iOS 15.0 floor matches
-  # Google Cast SDK 4.8.x's supported deployment target.
+  # alongside the default `pod 'QueuePlayer'`. The 16.0 floor tracks the
+  # library's own and sits above Google Cast SDK 4.8.x's iOS 15.0 minimum.
   s.subspec 'Chromecast' do |ss|
     ss.source_files = 'ios/Cast/Chromecast/**/*.swift'
-    ss.ios.deployment_target = '15.0'
+    ss.ios.deployment_target = '16.0'
     ss.dependency 'google-cast-sdk', '~> 4.8.4'
   end
 
@@ -87,11 +90,13 @@ Pod::Spec.new do |s|
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
 
-  # Cast serves consumer-supplied `file://` URLs to pull-only receivers
-  # (Chromecast / future DLNA) via a native `Network.framework` listener
-  # (`LocalMediaServer` / `MediaHTTPConnection`) — no third-party HTTP
-  # server dependency, no `:modular_headers` requirement on the consumer.
-  # Orthogonal to the streaming-only lookahead cache.
+  # The shared local-HTTP media server (`ios/MediaServer/MediaHTTPConnection`)
+  # serves media over a native `Network.framework` listener — no third-party
+  # HTTP server dependency, no `:modular_headers` requirement on the consumer.
+  # Two servers use it: Cast's `LocalMediaServer` serves consumer-supplied
+  # `file://` URLs to pull-only receivers (Chromecast / future DLNA), and the
+  # lookahead cache's `ReadThroughServer` serves the local player from the
+  # cache or, on a miss, the origin.
 
   load 'nitrogen/generated/ios/QueuePlayer+autolinking.rb'
   add_nitrogen_files(s)

package/README.md

@@ -24,13 +24,13 @@ A complete audio playback library for React Native — gapless and crossfade eng
 - **Remote-control skip mode** — choose track skip or interval skip (jump ±N seconds) for the lock screen / notification, adjustable at runtime.
 - **Sleep timer** — pause after a duration or at the end of the current track, with a volume fade; runs on a native wall-clock deadline.
 - **Now Playing format** — codec, container, sample rate, bitrate, and ReplayGain metadata for the active track.
-- **React hooks** — `useProgress`, `usePlaybackState`, `useActiveTrack`, `useCanSkip`, `useSleepTimer`, `useEqualizer`, `useVisualizerState`, `useLookaheadCache`, `useNowPlayingFormat`, `useCast`, `useAudioRoute`.
+- **React hooks** — `useProgress`, `usePlaybackState`, `useActiveTrack`, `useQueue`, `useCanSkip`, `useSleepTimer`, `useBufferState`, `useFullyBuffered`, `useEqualizer`, `useVisualizerState`, `useLookaheadCache`, `useNowPlayingFormat`, `useCast`, `useAudioRoute`.
 
 ## Requirements
 
 - React Native with the New Architecture enabled.
 - [`react-native-nitro-modules`](https://nitro.margelo.com/) (peer dependency).
-- iOS 15+ (the Chromecast subspec requires iOS 15).
+- iOS 16+ (Chromecast subspec included).
 - Android `minSdk` 24+.
 - Expo config-plugin support (the native setup is driven by the bundled Expo plugin).
 
@@ -107,7 +107,7 @@ The player is a singleton — `getTrackPlayer()` always returns the same instanc
 
 Most native setup is automatic (Nitro autolinking + the Android manifest merge + the Expo plugin). A few things you must do by hand — see the [Setup & manual configuration guide](https://ghenry22.github.io/react-native-queue-player/docs/guides/manual-setup) for full detail:
 
-- **iOS background audio** — add `audio` to `UIBackgroundModes` in your app config (`ios.infoPlist`). This is the one core background-playback step the plugin does not set for you:
+- **iOS background audio** — set automatically by the Expo plugin: it adds `audio` to `UIBackgroundModes` (on by default; pass `{ enableIosBGAudio: false }` only if your app declares `UIBackgroundModes` elsewhere). If you opt out, or use bare React Native (no plugin), set it yourself:
 
   ```json
   { "expo": { "ios": { "infoPlist": { "UIBackgroundModes": ["audio"] } } } }

package/android/build.gradle

@@ -129,6 +129,13 @@ dependencies {
   implementation "com.facebook.react:react-android"
   implementation project(":react-native-nitro-modules")
 
+  // @Keep drives R8 retention of the Nitrogen-generated bridge classes, and
+  // this artifact carries the consumer rule that honours it. Resolved
+  // transitively via Media3 / androidx.core today; declared explicitly at the
+  // version that already resolves so the dependency surface is honest rather
+  // than relying on another artifact keeping it in the graph.
+  implementation "androidx.annotation:annotation:1.8.1"
+
   // Media3 ExoPlayer — Android audio engine. Pinned to 1.10.0 (current
   // stable, Mar 2026). 1.10 keeps cache + audio/wake-lock APIs stable
   // and only deprecates MetadataRetriever (we don't use it).

package/android/consumer-rules.pro

@@ -1,10 +1,79 @@
 # React Native Queue Player — consumer R8 / ProGuard rules.
 #
-# Packaged into the published AAR via `consumerProguardFiles` and applied
+# Packaged into the AAR via `consumerProguardFiles` and applied
 # automatically to a consuming app's R8 run, so consumers need no manual rules
-# for this library's transitive dependencies.
+# for this library's native bindings or its transitive dependencies.
+#
+# The keeps below are deliberately whole-class rather than member-scoped. The
+# saving from narrowing them is a few kilobytes; the cost of getting one wrong
+# is a silent runtime failure in someone else's shipped app.
+
+# libraop's JNI_OnLoad binds this class by literal descriptor: src/main/cpp/
+# airplay_jni.cpp calls FindClass on the string
+# "com/margelo/nitro/queueplayer/cast/airplay/AirplayJNI", then resolves all 19
+# entries of its JNINativeMethod table by name and signature. React Native's own
+# rules pin the native method names but let the class be renamed, and the rule
+# that pins the class name ships only in AGP's optional default ProGuard file.
+# When the class is renamed, FindClass returns null, RegisterNatives never runs,
+# and AirPlay 1 reports itself unavailable rather than failing loudly.
+-keep class com.margelo.nitro.queueplayer.cast.airplay.AirplayJNI { *; }
+
+# libairplay2 binds this class the same way (src/main/cpp/airplay2_jni.cpp) and
+# additionally calls back into Kotlin: the audio drain thread invokes
+# onNativeSessionDied(long, int), resolved through GetStaticMethodID on that
+# literal name. Nothing in Kotlin calls that method, so without this rule R8
+# deletes it as unreachable — the native side then logs that upcalls are
+# disabled and carries on. Connect and streaming still work; only the receiver's
+# feedback timeout stops arriving, so a dead receiver never tears its session
+# down and never reverts routing to local. Playback stops with the UI still
+# showing the remote device.
+-keep class com.margelo.nitro.queueplayer.cast.airplay.AirPlay2JNI { *; }
+
+# libsignalsmith_stretch has no JNI_OnLoad; src/main/cpp/stretch_jni.cpp relies
+# on implicit JNI name mangling, so its exported symbols spell out both the
+# package path and the method name (Java_com_margelo_nitro_queueplayer_
+# SignalsmithStretchNative_nativeCreate). Renaming either half breaks the lookup
+# and the `music` pitch-correction mode throws UnsatisfiedLinkError on first use.
+# The native methods live on this class, not on its Companion.
+-keep class com.margelo.nitro.queueplayer.SignalsmithStretchNative { *; }
+
+# Named as a string in this library's own AndroidManifest.xml, through the cast
+# OPTIONS_PROVIDER_CLASS_NAME meta-data. aapt2 generates keep rules for manifest
+# components but does not descend into meta-data values, so nothing automatic
+# protects this one. The Play Services Cast AAR happens to keep it today via
+# `-keep public class * implements OptionsProvider`; this rule means correctness
+# does not depend on another artifact's rule surviving.
+-keep class com.margelo.nitro.queueplayer.cast.chromecast.ChromecastOptionsProvider { *; }
+
+# Named as a string in this library's own AndroidManifest.xml, as the
+# androidx.startup meta-data entry that registers it with
+# InitializationProvider. Same shape as the cast options provider above and
+# equally invisible to aapt2, which generates keep rules for manifest
+# components but not for meta-data values. androidx.startup keeps it today via
+# `-keepnames class * extends androidx.startup.Initializer`; this rule means
+# correctness does not depend on that.
+-keep class com.margelo.nitro.queueplayer.cast.airplay.AirPlayBackendInitializer { *; }
+
+# The Nitrogen-generated enums are read from C++ by constant name — e.g.
+# getStaticField<JCastProtocol>("AIRPLAY") — so losing a constant's name breaks
+# every conversion across the bridge. They survive today only because
+# androidx.annotation ships a keep rule for @Keep-annotated classes and Nitrogen
+# annotates what it generates, which makes correctness depend on that artifact
+# staying in the resolution graph. `**` also matches the enums internal to this
+# library that native code never touches; keeping them is accepted collateral.
+-keep enum com.margelo.nitro.queueplayer.** { *; }
+
+# Constructed from C++ during Nitro's onLoad via getConstructor<javaobject()>().
+# R8's compatibility FAQ states that full mode does not implicitly keep a kept
+# class's no-arg constructor; AGP's keep-rule documentation states that it does.
+# Current R8 keeps it. These rules make the library correct under either.
+-keep class com.margelo.nitro.queueplayer.TrackPlayer { <init>(); }
+-keep class com.margelo.nitro.queueplayer.Equalizer { <init>(); }
+-keep class com.margelo.nitro.queueplayer.Visualizer { <init>(); }
+-keep class com.margelo.nitro.queueplayer.CastManager { <init>(); }
 
-# The embedded Ktor CIO HTTP server (the Android AirPlay 2 receiver) ships
+# The embedded Ktor CIO HTTP server (the Chromecast local media server, which
+# serves local files to a receiver) ships
 # io.ktor.util.debug.IntellijIdeaDebugDetector, which references
 # java.lang.management.ManagementFactory and RuntimeMXBean to detect an attached
 # IntelliJ debugger. Those JMX classes are JVM-only and absent on Android, so a

package/android/src/main/cpp/airplay2_control.c

@@ -458,7 +458,7 @@ int ap2_record(ap2_session_t *session) {
 /* ---- FLUSH ---- */
 
 int ap2_flush(ap2_session_t *session) {
-    /* Build RTP-Info header per OwnTone airplay.c:2409-2415:
+    /* Build RTP-Info header per OwnTone airplay.c:
      * "RTP-Info: seq=<seqnum>;rtptime=<rtptime>" */
     char rtp_info[128];
     snprintf(rtp_info, sizeof(rtp_info),
@@ -524,7 +524,7 @@ int ap2_set_metadata(ap2_session_t *session,
         return -1;
     }
 
-    /* OwnTone airplay.c:2499 — adds RTP-Info header. */
+    /* OwnTone airplay.c — adds RTP-Info header. */
     char rtp_info[128];
     snprintf(rtp_info, sizeof(rtp_info),
              "RTP-Info: rtptime=%u\r\n",
@@ -556,7 +556,7 @@ int ap2_set_artwork(ap2_session_t *session,
                     const char *content_type) {
     if (!data || len == 0) return 0;
 
-    /* OwnTone airplay.c:2507-2548 — raw image body with format-specific CT. */
+    /* OwnTone airplay.c — raw image body with format-specific CT. */
     char rtp_info[128];
     snprintf(rtp_info, sizeof(rtp_info),
              "RTP-Info: rtptime=%u\r\n",
@@ -581,7 +581,7 @@ int ap2_set_artwork(ap2_session_t *session,
 int ap2_set_progress(ap2_session_t *session,
                      uint32_t elapsed_ms, uint32_t duration_ms) {
     /* Convert ms to RTP timestamps.
-     * Per OwnTone airplay.c:2481-2504 — "progress: start/current/end". */
+     * Per OwnTone airplay.c — "progress: start/current/end". */
     uint32_t rtp_start = session->rtp_timestamp;
     uint32_t rtp_pos = rtp_start + (uint32_t)((uint64_t)elapsed_ms * session->sample_rate / 1000);
     uint32_t rtp_end = rtp_start + (uint32_t)((uint64_t)duration_ms * session->sample_rate / 1000);

package/android/src/main/cpp/airplay2_control.h

@@ -41,7 +41,7 @@ int ap2_record(ap2_session_t *session);
 
 /**
  * FLUSH: stop audio playback on the receiver.
- * Sends RTP-Info header with current seq/rtptime per OwnTone airplay.c:2402-2418.
+ * Sends RTP-Info header with current seq/rtptime per OwnTone airplay.c.
  * @return 0 on success, -1 on failure
  */
 int ap2_flush(ap2_session_t *session);
@@ -55,7 +55,7 @@ int ap2_set_volume(ap2_session_t *session, float vol_db);
 
 /**
  * SET_PARAMETER metadata (DMAP-encoded title/artist/album).
- * Per OwnTone airplay.c:2551-2575.
+ * Per OwnTone airplay.c.
  * @return 0 on success, -1 on failure
  */
 int ap2_set_metadata(ap2_session_t *session,
@@ -63,7 +63,7 @@ int ap2_set_metadata(ap2_session_t *session,
 
 /**
  * SET_PARAMETER artwork (raw JPEG/PNG image bytes).
- * Per OwnTone airplay.c:2507-2548.
+ * Per OwnTone airplay.c.
  * @param content_type  "image/jpeg" or "image/png"
  * @return 0 on success, -1 on failure
  */
@@ -73,7 +73,7 @@ int ap2_set_artwork(ap2_session_t *session,
 
 /**
  * SET_PARAMETER progress (elapsed/duration in milliseconds).
- * Per OwnTone airplay.c:2481-2504. Converts ms to RTP timestamps.
+ * Per OwnTone airplay.c. Converts ms to RTP timestamps.
  * @return 0 on success, -1 on failure
  */
 int ap2_set_progress(ap2_session_t *session,

package/android/src/main/cpp/airplay2_jni.cpp

@@ -130,7 +130,7 @@ static jboolean nativeAp2Connect(JNIEnv *, jclass, jlong handle) {
      * ap2_connect() calls ap2_rtsp_connect() internally. */
     if (ap2_connect(s) != 0) {
         /* If pairing required, keep TCP alive for subsequent pair-setup.
-         * Per OwnTone airplay.c:1485-1539 — socket reused across auth. */
+         * Per OwnTone airplay.c — socket reused across auth. */
         if (s->pairing_required) {
             __android_log_print(ANDROID_LOG_INFO, TAG,
                 "Connect: pairing required (auth_mode=%d), keeping TCP alive",
@@ -204,11 +204,6 @@ static void nativeAp2Destroy(JNIEnv *, jclass, jlong handle) {
 // Pairing
 // ---------------------------------------------------------------------------
 
-static jboolean nativeAp2NeedsPairing(JNIEnv *, jclass, jlong handle) {
-    auto *s = toSession(handle);
-    return (s && s->pairing_required && !s->has_auth_key) ? JNI_TRUE : JNI_FALSE;
-}
-
 static jboolean nativeAp2PairPinStart(JNIEnv *, jclass, jlong handle) {
     auto *s = toSession(handle);
     if (!s) return JNI_FALSE;
@@ -270,11 +265,6 @@ static jstring nativeAp2PairSetup(JNIEnv *env, jclass,
     return result;
 }
 
-static jint nativeAp2GetPairingState(JNIEnv *, jclass, jlong handle) {
-    auto *s = toSession(handle);
-    return s ? static_cast<jint>(s->state) : 0;
-}
-
 static jint nativeAp2GetAuthMode(JNIEnv *, jclass, jlong handle) {
     auto *s = toSession(handle);
     return s ? static_cast<jint>(s->auth_mode) : 0;
@@ -341,7 +331,7 @@ static void nativeAp2SetVolume(JNIEnv *, jclass, jlong handle, jfloat vol) {
     s->volume = vol;
     /* Send volume over RTSP if streaming.
      * Convert 0.0-1.0 linear to dB: 0→-144 (mute), 1→0 (full).
-     * Per OwnTone airplay.c:2456-2478 — SET_PARAMETER text/parameters. */
+     * Per OwnTone airplay.c — SET_PARAMETER text/parameters. */
     if (s->state >= AP2_STATE_RECORD) {
         float vol_db;
         if (vol <= 0.0f) {
@@ -403,7 +393,7 @@ static void nativeAp2Pause(JNIEnv *, jclass, jlong handle) {
     if (!s) return;
     ap2_audio_pause(s);
     /* Send FLUSH so receiver knows audio stopped.
-     * Per OwnTone airplay.c:3660-3662 — FLUSH after stopping audio. */
+     * Per OwnTone airplay.c — FLUSH after stopping audio. */
     if (s->state >= AP2_STATE_RECORD) {
         ap2_flush(s);
     }
@@ -466,18 +456,12 @@ static const JNINativeMethod sMethods[] = {
         "(J)V",
         reinterpret_cast<void *>(nativeAp2Destroy)},
     /* Pairing */
-    {"nativeAp2NeedsPairing",
-        "(J)Z",
-        reinterpret_cast<void *>(nativeAp2NeedsPairing)},
     {"nativeAp2PairPinStart",
         "(J)Z",
         reinterpret_cast<void *>(nativeAp2PairPinStart)},
     {"nativeAp2PairSetup",
         "(JLjava/lang/String;)Ljava/lang/String;",
         reinterpret_cast<void *>(nativeAp2PairSetup)},
-    {"nativeAp2GetPairingState",
-        "(J)I",
-        reinterpret_cast<void *>(nativeAp2GetPairingState)},
     {"nativeAp2GetAuthMode",
         "(J)I",
         reinterpret_cast<void *>(nativeAp2GetAuthMode)},
@@ -546,19 +530,39 @@ jint ap2_register_natives(JavaVM *vm) {
 
     jclass clazz = env->FindClass(sClassName);
     if (!clazz) {
-        __android_log_print(ANDROID_LOG_WARN, TAG,
-            "AirPlay2JNI class not found — RegisterNatives deferred");
-        return JNI_VERSION_1_6;
+        /* Leaves a pending NoClassDefFoundError. Clear it and fail the load
+         * outright: nothing retries registration, so reporting success here
+         * would leave the Kotlin object reporting AirPlay 2 as available with
+         * no natives bound, and the first call would throw
+         * UnsatisfiedLinkError. Failing makes System.loadLibrary throw, and
+         * AirPlay2JNI's initialiser catches that and sets isAvailable false. */
+        env->ExceptionClear();
+        __android_log_print(ANDROID_LOG_ERROR, TAG,
+            "AirPlay2JNI class not found — AirPlay 2 unavailable");
+        return JNI_ERR;
     }
 
     if (env->RegisterNatives(clazz, sMethods,
             sizeof(sMethods) / sizeof(sMethods[0])) < 0) {
+        /* An unresolved table entry leaves a pending NoSuchMethodError. */
+        env->ExceptionClear();
         __android_log_print(ANDROID_LOG_ERROR, TAG, "RegisterNatives failed");
         return JNI_ERR;
     }
 
     /* Cache the session-death upcall target (global ref + static method id). */
     sAp2JniClass = (jclass)env->NewGlobalRef(clazz);
+    if (!sAp2JniClass) {
+        /* Null only when the global reference table is exhausted, which can
+         * leave a pending OutOfMemoryError; clear it so the load reports
+         * success with upcalls disabled, matching the missing-method path
+         * below. The check has to precede GetStaticMethodID, which aborts
+         * under CheckJNI when handed a null class. */
+        env->ExceptionClear();
+        __android_log_print(ANDROID_LOG_WARN, TAG,
+            "could not retain AirPlay2JNI — upcalls disabled");
+        return JNI_VERSION_1_6;
+    }
     sOnNativeSessionDied = env->GetStaticMethodID(
         sAp2JniClass, "onNativeSessionDied", "(JI)V");
     if (!sOnNativeSessionDied) {

package/android/src/main/cpp/airplay2_pair.c

@@ -79,14 +79,14 @@ int ap2_probe_info(ap2_session_t *session) {
     LOGI("/info: statusFlags=0x%llx", (unsigned long long)status_flags);
 
     /* Store individual statusFlags bits for the auth decision tree.
-     * Per OwnTone airplay.c:181-190 and 3304-3345. */
+     * Per OwnTone airplay.c. */
     session->one_time_pairing = (status_flags & ((uint64_t)1 << 9)) ? 1 : 0;
     session->pin_required     = (status_flags & ((uint64_t)1 << 3)) ? 1 : 0;
     session->password_required = (status_flags & ((uint64_t)1 << 7)) ? 1 : 0;
     LOGI("/info: one_time_pairing=%d pin_required=%d password_required=%d",
          session->one_time_pairing, session->pin_required, session->password_required);
 
-    /* Decide auth mode.  Per OwnTone airplay.c:3304-3345 and pyatv:
+    /* Decide auth mode.  Per OwnTone airplay.c and pyatv:
      * ONE_TIME_PAIRING ALWAYS means PIN mode, even when PASSWORD_REQUIRED
      * is also set.  The PIN is displayed on the receiver; the password is
      * a separate concern used for HTTP Digest auth on encrypted RTSP.
@@ -100,7 +100,7 @@ int ap2_probe_info(ap2_session_t *session) {
         session->auth_mode = AP2_AUTH_PIN;
         session->pairing_required = 1;
         session->transient_ok = 0;
-        /* PIN_REQUIRED always clears auth_key — per OwnTone airplay.c:3325-3327. */
+        /* PIN_REQUIRED always clears auth_key — per OwnTone airplay.c. */
         session->has_auth_key = 0;
     } else if (session->password_required) {
         session->auth_mode = AP2_AUTH_PASSWORD;
@@ -394,7 +394,7 @@ int ap2_pair_transient(ap2_session_t *session) {
 
 int ap2_pair_pin_start(ap2_session_t *session) {
     /* POST /pair-pin-start — triggers PIN display on receiver.
-     * Per OwnTone airplay.c:3670 — AIRPLAY_SEQ_PIN_START is a separate
+     * Per OwnTone airplay.c — AIRPLAY_SEQ_PIN_START is a separate
      * sequence from AIRPLAY_SEQ_PAIR_SETUP. */
     ap2_rtsp_response_t resp;
     if (ap2_rtsp_request(session, "POST", "/pair-pin-start",
@@ -563,7 +563,7 @@ int ap2_connect(ap2_session_t *session) {
     /* Step 2: Probe /info — sets auth_mode, pairing_required, etc. */
     if (ap2_probe_info(session) != 0) return -1;
 
-    /* Step 3: Pairing — per OwnTone airplay.c:3304-3345 decision tree. */
+    /* Step 3: Pairing — per OwnTone airplay.c decision tree. */
 
     if (session->auth_mode == AP2_AUTH_PIN) {
         /* ONE_TIME_PAIRING or PIN_REQUIRED. */
@@ -588,7 +588,7 @@ int ap2_connect(ap2_session_t *session) {
             session->has_auth_key = 0;
         }
         if (session->password[0]) {
-            /* Per OwnTone airplay.c:3304-3312 — when ONE_TIME_PAIRING is set,
+            /* Per OwnTone airplay.c — when ONE_TIME_PAIRING is set,
              * always call /pair-pin-start first to put the receiver in pairing
              * mode before SRP.  This is required even for password-protected
              * receivers: without it the Mac may process the SRP exchange but
@@ -636,7 +636,7 @@ int ap2_connect(ap2_session_t *session) {
         if (ret == 0) return 0;
 
         /* Transient→normal fallback: if receiver rejected transient with 470,
-         * switch to PIN-based auth. Per OwnTone airplay.c:3434-3443. */
+         * switch to PIN-based auth. Per OwnTone airplay.c. */
         if (session->state == AP2_STATE_PAIR) {
             LOGI("Transient rejected — receiver requires PIN");
             session->auth_mode = AP2_AUTH_PIN;

package/android/src/main/cpp/airplay2_pair.h

@@ -52,7 +52,7 @@ int ap2_pair_transient(ap2_session_t *session);
 
 /**
  * POST /pair-pin-start — trigger PIN display on receiver.
- * Per OwnTone airplay.c:3670 — separate from pair-setup.
+ * Per OwnTone airplay.c — separate from pair-setup.
  * Call this for PIN-based auth BEFORE ap2_pair_setup().
  * Do NOT call this for password-based auth (password is known, not displayed).
  *
@@ -65,7 +65,7 @@ int ap2_pair_pin_start(ap2_session_t *session);
  * Generates and stores Ed25519 identity keys.
  * The credential can be a 4-digit PIN (displayed on device) or an
  * arbitrary password string — both use the same SRP mechanism.
- * Per OwnTone pair_homekit.c:1184 — strdup(pin) as SRP password.
+ * Per OwnTone pair_homekit.c — strdup(pin) as SRP password.
  *
  * @param pin        PIN or password string
  * @param auth_key   OUT: hex-encoded auth key for persistence (192 chars + NUL)

package/android/src/main/cpp/airplay2_rtsp.c

@@ -202,7 +202,7 @@ static int recv_decrypt_frame(ap2_session_t *s, uint8_t *out, size_t out_cap) {
     return ret == 0 ? (int)frame_len : -1;
 }
 
-/* ---- HTTP Digest auth (OwnTone airplay.c:684-779) ---- */
+/* ---- HTTP Digest auth (OwnTone airplay.c) ---- */
 
 /**
  * Compute MD5 hex digest of the concatenated inputs separated by ':'.
@@ -229,7 +229,7 @@ static void md5_hex(const char *a, const char *b, const char *c, char out[33]) {
 
 /**
  * Parse WWW-Authenticate: Digest realm="...", nonce="..." from response.
- * OwnTone airplay.c:805-878.
+ * OwnTone airplay.c.
  */
 static int parse_www_authenticate(ap2_session_t *s, const char *resp_buf) {
     const char *hdr = strstr(resp_buf, "WWW-Authenticate:");
@@ -279,13 +279,13 @@ static int parse_www_authenticate(ap2_session_t *s, const char *resp_buf) {
 
 /**
  * Build Authorization: Digest ... header string.
- * OwnTone airplay.c:684-779 — HA1=MD5("":realm:password), HA2=MD5(method:uri).
+ * OwnTone airplay.c — HA1=MD5("":realm:password), HA2=MD5(method:uri).
  * Returns heap-allocated string like "Authorization: Digest ...\r\n", or NULL.
  */
 static char *build_digest_header(ap2_session_t *s, const char *method, const char *uri) {
     if (!s->has_digest_auth || !s->password[0]) return NULL;
 
-    /* HA1 = MD5(username:realm:password) — username is empty per OwnTone:687 */
+    /* HA1 = MD5(username:realm:password) — username is empty per OwnTone */
     char ha1[33];
     md5_hex("", s->realm, s->password, ha1);
 
@@ -372,7 +372,7 @@ int ap2_rtsp_request_ex(ap2_session_t *session,
     const char *dn = session->device_name[0] ? session->device_name : NULL;
 
     /* Use session URL for RTSP methods, raw path for HTTP-style endpoints.
-     * Per OwnTone airplay.c:3814 — session_url for SETUP/RECORD/etc,
+     * Per OwnTone airplay.c — session_url for SETUP/RECORD/etc,
      * raw path for /info, /pair-*, /feedback, /peer-list-changed. */
     const char *uri = path;
     if (strcmp(method, "SETUP") == 0 || strcmp(method, "RECORD") == 0 ||
@@ -382,7 +382,7 @@ int ap2_rtsp_request_ex(ap2_session_t *session,
     }
 
     /* Auto-include Digest Authorization on all requests after first 401.
-     * Per OwnTone airplay.c:908-912 — auth_header_add on every request. */
+     * Per OwnTone airplay.c — auth_header_add on every request. */
     char *digest_hdr = NULL;
     char *merged_headers = NULL;
     if (session->has_digest_auth) {
@@ -399,7 +399,7 @@ int ap2_rtsp_request_ex(ap2_session_t *session,
     }
     const char *all_extra = merged_headers ? merged_headers : "";
 
-    /* DACP-ID / Client-Instance / Active-Remote — per OwnTone airplay.c:919-926.
+    /* DACP-ID / Client-Instance / Active-Remote — per OwnTone airplay.c.
      * These let the receiver persistently identify this client. */
     char dacp_hdr[192];
     if (session->dacp_id[0]) {
@@ -562,7 +562,7 @@ int ap2_rtsp_request_ex(ap2_session_t *session,
     }
 
     /* 401 Unauthorized → parse Digest challenge and retry once.
-     * Per OwnTone airplay.c:3183-3197. Must happen before freeing resp_buf. */
+     * Per OwnTone airplay.c. Must happen before freeing resp_buf. */
     if (resp->status == 401 && session->password[0] && !session->has_digest_auth) {
         if (parse_www_authenticate(session, (char *)resp_buf) == 0) {
             LOGI("Digest auth: realm=%s — retrying %s %s",

package/android/src/main/cpp/airplay2_session.c

@@ -80,7 +80,7 @@ ap2_session_t *ap2_session_create(const char *host, int port,
     pthread_mutex_init(&s->ring_mutex, NULL);
 
     /* DACP-ID / Client-Instance — 16-char uppercase hex.
-     * Active-Remote — 32-bit decimal. Per OwnTone airplay.c:919-926. */
+     * Active-Remote — 32-bit decimal. Per OwnTone airplay.c. */
     {
         uint8_t id_bytes[8];
         randombytes_buf(id_bytes, sizeof(id_bytes));
@@ -105,7 +105,7 @@ ap2_session_t *ap2_session_create(const char *host, int port,
     /* PTP clock ID — random 64-bit identifier for timing sync. */
     s->ptp_clock_id = ((uint64_t)rand() << 32) | (uint64_t)rand();
 
-    /* Random RTSP session ID — per OwnTone airplay.c:1535.
+    /* Random RTSP session ID — per OwnTone airplay.c.
      * Used in the RTSP URL: rtsp://<host>/<session_id>. */
     s->session_id = (uint32_t)rand();
     snprintf(s->session_url, sizeof(s->session_url),