MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-25 20:16:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

[input] Refactor metadata handling + add playback wait timeout

Browse Source 
Previously input_metadata_get() would retrieve artwork from the source being
read currently, which might not be the one that triggered the FLAG_METADATA
event. So to fix this the metadata is now read by the input module itself when
the METADATA event happens, and the result is stored with the marker.

The commit also includes a timer so that the input thread does loop forever
if the player never starts reading.

Also some refactoring of metadata + abolish input_metadata_get and
input_quality_get. The latter in an attempt to treat the two in the same way.
This commit is contained in:
ejurgensen
2019-03-18 22:57:18 +01:00
parent 992ab90876
commit ab0a6055b9
3 changed files with 191 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/input.h
View File

@@ -71,22 +71,25 @@ typedef int (*input_cb)(void);
struct input_metadata
{
// queue_item id
uint32_t item_id;
int startup;
// Input can override the default player progress by setting this
// FIXME only implemented for Airplay speakers currently
uint32_t pos_ms;
uint64_t start;
uint64_t rtptime;
uint64_t offset;
// The player will update queue_item with the below
uint32_t song_length;
// Sets new song length (input will also update queue_item)
uint32_t len_ms;
// Input can update queue_item with the below
char *artist;
char *title;
char *album;
char *genre;
char *artwork_url;
// Indicates whether we are starting playback. Just passed on to output.
int startup;
};
struct input_definition
@@ -164,11 +167,12 @@ input_wait(void);
*
* @in data Output buffer
* @in size How much data to move to the output buffer
* @out flags Flags INPUT_FLAG_*
* @out flag Flag INPUT_FLAG_*
* @out flagdata Data associated with the flag, e.g. quality or metadata struct
* @return Number of bytes moved, -1 on error
*/
int
input_read(void *data, size_t size, short *flags);
input_read(void *data, size_t size, short *flag, void **flagdata);
/*
* Player can set this to get a callback from the input when the input buffer
@@ -212,18 +216,6 @@ input_stop(void);
void
input_flush(short *flags);
/*
* Returns the current quality of data returned by intput_read().
*/
int
input_quality_get(struct media_quality *quality);
/*
* Gets metadata from the input, returns 0 if metadata is set, otherwise -1
*/
int
input_metadata_get(struct input_metadata *metadata);
/*
* Free the entire struct
*/