Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update URI in player object immediately when SetAVTransportURI is received and player is already playing. #241

Merged
merged 4 commits into from
Aug 24, 2022
Merged

Update URI in player object immediately when SetAVTransportURI is received and player is already playing. #241

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e520cc1
Update the playbin's URI when set_uri is called and we are currently …
mill1000 Jan 2, 2021
3006247
Place set_uri functions below play functions so it will compile.
mill1000 Jan 2, 2021
8bbee3e
Return correct value on success in output_gstreamer_seek.
mill1000 Nov 6, 2021
f68f91a
Correct indentation to match existing
mill1000 Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions src/output_gstreamer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,6 @@ static GstState get_current_player_state() {
return state;
}

static void output_gstreamer_set_next_uri(const char *uri) {
Log_info("gstreamer", "Set next uri to '%s'", uri);
free(gs_next_uri_);
gs_next_uri_ = (uri && *uri) ? strdup(uri) : NULL;
}

static void output_gstreamer_set_uri(const char *uri,
output_update_meta_cb_t meta_cb) {
Log_info("gstreamer", "Set uri to '%s'", uri);
free(gsuri_);
gsuri_ = (uri && *uri) ? strdup(uri) : NULL;
meta_update_callback_ = meta_cb;
SongMetaData_clear(&song_meta_);
}

static int output_gstreamer_play(output_transition_cb_t callback) {
play_trans_callback_ = callback;
if (get_current_player_state() != GST_STATE_PAUSED) {
Expand Down Expand Up @@ -195,16 +180,33 @@ static int output_gstreamer_pause(void) {
}

static int output_gstreamer_seek(gint64 position_nanos) {
if (gst_element_seek(player_, 1.0, GST_FORMAT_TIME,
GST_SEEK_FLAG_FLUSH,
GST_SEEK_TYPE_SET, position_nanos,
GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) {
return -1;
} else {
if (gst_element_seek_simple(player_, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
position_nanos)) {
return 0;
} else {
return -1;
}
}

static void output_gstreamer_set_next_uri(const char *uri) {
Log_info("gstreamer", "Set next uri to '%s'", uri);
free(gs_next_uri_);
gs_next_uri_ = (uri && *uri) ? strdup(uri) : NULL;
}

static void output_gstreamer_set_uri(const char *uri,
output_update_meta_cb_t meta_cb) {
Log_info("gstreamer", "Set uri to '%s'", uri);
free(gsuri_);
gsuri_ = (uri && *uri) ? strdup(uri) : NULL;
meta_update_callback_ = meta_cb;
SongMetaData_clear(&song_meta_);

// If already playing, update the playbin's URI
if (get_current_player_state() == GST_STATE_PLAYING)
output_gstreamer_play(play_trans_callback_);
}

#if 0
static const char *gststate_get_name(GstState state)
{
Expand Down