From 1faa49551efebd6a457f1be8597cac850a111300 Mon Sep 17 00:00:00 2001 From: "F. Duncanh" Date: Mon, 10 Nov 2025 19:28:56 -0500 Subject: [PATCH] cleanup ancient cruft; plus a fix in airplay_video.c --- lib/airplay_video.c | 4 +++- lib/dnssd.c | 10 +++++----- lib/dnssd.h | 4 +--- lib/raop.h | 4 ---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/lib/airplay_video.c b/lib/airplay_video.c index 44738d1..14d4562 100644 --- a/lib/airplay_video.c +++ b/lib/airplay_video.c @@ -226,6 +226,8 @@ language_t* master_playlist_process_language(char * data, int *slices, int *lang } if (!strncmp(ptr - strlen("dubbed-auto") - 2, "dubbed-auto", strlen("dubbed-auto"))) { languages[i].type = 'd'; + } else if (!strncmp(ptr - strlen("dubbed") - 2, "dubbed", strlen("dubbed"))) { + languages[i].type = 'd'; } else if (!strncmp(ptr - strlen("original") - 2, "original", strlen("original"))) { languages[i].type = 'o'; } else { @@ -271,7 +273,7 @@ language_t* master_playlist_process_language(char * data, int *slices, int *lang /* verify expected structure of language choice information */ for (int i = 1; i <= count; i++) { if (i % *language_count) { - assert(languages[i].type == 'd'); + assert(languages[i].type != 'o'); } else { assert(languages[i].type == 'o'); } diff --git a/lib/dnssd.c b/lib/dnssd.c index 44adac2..638bef8 100644 --- a/lib/dnssd.c +++ b/lib/dnssd.c @@ -32,13 +32,13 @@ #include "config.h" #endif -#include "dnssdint.h" -#include "dnssd.h" -#include "global.h" #include "compat.h" -#include "utils.h" - #include +#include "dnssd.h" + +#include "dnssdint.h" +#include "global.h" +#include "utils.h" #define MAX_DEVICEID 18 #define MAX_SERVNAME 256 diff --git a/lib/dnssd.h b/lib/dnssd.h index 007a83a..c4600e8 100644 --- a/lib/dnssd.h +++ b/lib/dnssd.h @@ -16,9 +16,7 @@ #define DNSSD_H #include -#if defined(WIN32) && defined(DLL_EXPORT) -# define DNSSD_API __declspec(dllexport) -#else +#ifndef DNSSD_API # define DNSSD_API #endif diff --git a/lib/raop.h b/lib/raop.h index d1581a8..e2a4f6d 100644 --- a/lib/raop.h +++ b/lib/raop.h @@ -23,11 +23,7 @@ #include "raop_ntp.h" #include "airplay_video.h" -#if defined (WIN32) && defined(DLL_EXPORT) -# define RAOP_API __declspec(dllexport) -#else # define RAOP_API -#endif #ifdef __cplusplus extern "C" {