mirror of
https://github.com/morgan9e/UxPlay
synced 2026-04-14 00:04:13 +09:00
cleanup ancient cruft; plus a fix in airplay_video.c
This commit is contained in:
@@ -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"))) {
|
if (!strncmp(ptr - strlen("dubbed-auto") - 2, "dubbed-auto", strlen("dubbed-auto"))) {
|
||||||
languages[i].type = 'd';
|
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"))) {
|
} else if (!strncmp(ptr - strlen("original") - 2, "original", strlen("original"))) {
|
||||||
languages[i].type = 'o';
|
languages[i].type = 'o';
|
||||||
} else {
|
} else {
|
||||||
@@ -271,7 +273,7 @@ language_t* master_playlist_process_language(char * data, int *slices, int *lang
|
|||||||
/* verify expected structure of language choice information */
|
/* verify expected structure of language choice information */
|
||||||
for (int i = 1; i <= count; i++) {
|
for (int i = 1; i <= count; i++) {
|
||||||
if (i % *language_count) {
|
if (i % *language_count) {
|
||||||
assert(languages[i].type == 'd');
|
assert(languages[i].type != 'o');
|
||||||
} else {
|
} else {
|
||||||
assert(languages[i].type == 'o');
|
assert(languages[i].type == 'o');
|
||||||
}
|
}
|
||||||
|
|||||||
10
lib/dnssd.c
10
lib/dnssd.c
@@ -32,13 +32,13 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "dnssdint.h"
|
|
||||||
#include "dnssd.h"
|
|
||||||
#include "global.h"
|
|
||||||
#include "compat.h"
|
#include "compat.h"
|
||||||
#include "utils.h"
|
|
||||||
|
|
||||||
#include <dns_sd.h>
|
#include <dns_sd.h>
|
||||||
|
#include "dnssd.h"
|
||||||
|
|
||||||
|
#include "dnssdint.h"
|
||||||
|
#include "global.h"
|
||||||
|
#include "utils.h"
|
||||||
|
|
||||||
#define MAX_DEVICEID 18
|
#define MAX_DEVICEID 18
|
||||||
#define MAX_SERVNAME 256
|
#define MAX_SERVNAME 256
|
||||||
|
|||||||
@@ -16,9 +16,7 @@
|
|||||||
#define DNSSD_H
|
#define DNSSD_H
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#if defined(WIN32) && defined(DLL_EXPORT)
|
#ifndef DNSSD_API
|
||||||
# define DNSSD_API __declspec(dllexport)
|
|
||||||
#else
|
|
||||||
# define DNSSD_API
|
# define DNSSD_API
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -23,11 +23,7 @@
|
|||||||
#include "raop_ntp.h"
|
#include "raop_ntp.h"
|
||||||
#include "airplay_video.h"
|
#include "airplay_video.h"
|
||||||
|
|
||||||
#if defined (WIN32) && defined(DLL_EXPORT)
|
|
||||||
# define RAOP_API __declspec(dllexport)
|
|
||||||
#else
|
|
||||||
# define RAOP_API
|
# define RAOP_API
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|||||||
Reference in New Issue
Block a user