Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

GstEnginePipeline: Rename PlaybinProbe to PadProbe

This commit is contained in:
Jonas Kvinge 2024-08-23 00:17:33 +02:00
parent 91eef0d695
commit 9b5fe3bfd6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/engine/gstenginepipeline.cpp
View File

@ -141,7 +141,7 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent)
eventprobe_(nullptr), eventprobe_(nullptr),
upstream_events_probe_cb_id_(0), upstream_events_probe_cb_id_(0),
buffer_probe_cb_id_(0), buffer_probe_cb_id_(0),
playbin_probe_cb_id_(0), pad_probe_cb_id_(0),
element_added_cb_id_(-1), element_added_cb_id_(-1),
element_removed_cb_id_(-1), element_removed_cb_id_(-1),
pad_added_cb_id_(-1), pad_added_cb_id_(-1),
@ -1131,7 +1131,7 @@ void GstEnginePipeline::PadAddedCallback(GstElement *element, GstPad *pad, gpoin
gst_pad_set_offset(pad, static_cast<gint64>(running_time)); gst_pad_set_offset(pad, static_cast<gint64>(running_time));
// Add a probe to the pad so we can update last_playbin_segment_. // Add a probe to the pad so we can update last_playbin_segment_.
instance->playbin_probe_cb_id_ = gst_pad_add_probe(pad, static_cast<GstPadProbeType>(GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_FLUSH), PlaybinProbeCallback, instance, nullptr); instance->pad_probe_cb_id_ = gst_pad_add_probe(pad, static_cast<GstPadProbeType>(GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_FLUSH), PadProbeCallback, instance, nullptr);
instance->pipeline_connected_ = true; instance->pipeline_connected_ = true;
if (instance->pending_seek_nanosec_ != -1 && instance->pipeline_active_) { if (instance->pending_seek_nanosec_ != -1 && instance->pipeline_active_) {
@ -1141,7 +1141,7 @@ void GstEnginePipeline::PadAddedCallback(GstElement *element, GstPad *pad, gpoin
} }
GstPadProbeReturn GstEnginePipeline::PlaybinProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self) { GstPadProbeReturn GstEnginePipeline::PadProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self) {
GstEnginePipeline *instance = reinterpret_cast<GstEnginePipeline*>(self); GstEnginePipeline *instance = reinterpret_cast<GstEnginePipeline*>(self);

4
src/engine/gstenginepipeline.h
View File

@ -172,7 +172,7 @@ class GstEnginePipeline : public QObject {
// Static callbacks. The GstEnginePipeline instance is passed in the last argument. // Static callbacks. The GstEnginePipeline instance is passed in the last argument.
static GstPadProbeReturn UpstreamEventsProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self); static GstPadProbeReturn UpstreamEventsProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self);
static GstPadProbeReturn BufferProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self); static GstPadProbeReturn BufferProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self);
static GstPadProbeReturn PlaybinProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self); static GstPadProbeReturn PadProbeCallback(GstPad *pad, GstPadProbeInfo *info, gpointer self);
static void ElementAddedCallback(GstBin *bin, GstBin *sub_bin, GstElement *element, gpointer self); static void ElementAddedCallback(GstBin *bin, GstBin *sub_bin, GstElement *element, gpointer self);
static void ElementRemovedCallback(GstBin *bin, GstBin *sub_bin, GstElement *element, gpointer self); static void ElementRemovedCallback(GstBin *bin, GstBin *sub_bin, GstElement *element, gpointer self);
static void PadAddedCallback(GstElement *element, GstPad *pad, gpointer self); static void PadAddedCallback(GstElement *element, GstPad *pad, gpointer self);
@ -343,7 +343,7 @@ class GstEnginePipeline : public QObject {
gulong upstream_events_probe_cb_id_; gulong upstream_events_probe_cb_id_;
gulong buffer_probe_cb_id_; gulong buffer_probe_cb_id_;
gulong playbin_probe_cb_id_; gulong pad_probe_cb_id_;
glong element_added_cb_id_; glong element_added_cb_id_;
glong element_removed_cb_id_; glong element_removed_cb_id_;
glong pad_added_cb_id_; glong pad_added_cb_id_;