[Libreoffice-commits] core.git: avmedia/source compilerplugins/clang

[Michael Weghorn (via logerrit)]

 avmedia/source/gstreamer/gstplayer.cxx              |   16 ++--------------
 compilerplugins/clang/constantparam.numbers.results |    8 --------
 2 files changed, 2 insertions(+), 22 deletions(-)

New commits:
commit f6d3e145d7642aae0e6dac292d910149be296e08
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Jul 22 13:01:42 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon Jul 22 17:40:50 2019 +0200

    avmedia: Drop 'wrap_*' functions
    
    Just call the corresponding GStreamer functions directly.
    The wrapper functions are pointless since commit
    6b911ae9eb9484bebbdc1323210020486f5ef33f
    ("Drop support for gstreamer-0.10").
    
    Change-Id: I2963bd25a83632f4e693a1691180790452edffda
    Reviewed-on: https://gerrit.libreoffice.org/76116
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 111622cbac9c..1a2e2e966add 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -412,18 +412,6 @@ void Player::processMessage( GstMessage *message )
     }
 }
 
-
-static gboolean wrap_element_query_position (GstElement *element, GstFormat format, gint64 *cur)
-{
-    return gst_element_query_position( element, format, cur );
-}
-
-
-static gboolean wrap_element_query_duration (GstElement *element, GstFormat format, gint64 *duration)
-{
-    return gst_element_query_duration( element, format, duration );
-}
-
 #define LCL_WAYLAND_DISPLAY_HANDLE_CONTEXT_TYPE "GstWaylandDisplayHandleContextType"
 
 static gboolean lcl_is_wayland_display_handle_need_context_message(GstMessage* msg)
@@ -495,7 +483,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
     if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ASYNC_DONE ) {
         if( mnDuration == 0) {
             gint64 gst_duration = 0;
-            if( wrap_element_query_duration( mpPlaybin, GST_FORMAT_TIME, &gst_duration) )
+            if( gst_element_query_duration( mpPlaybin, GST_FORMAT_TIME, &gst_duration) )
                 mnDuration = gst_duration;
         }
         if( mnWidth == 0 ) {
@@ -712,7 +700,7 @@ double SAL_CALL Player::getMediaTime()
     if( mpPlaybin ) {
         // get current position in the stream
         gint64 gst_position;
-        if( wrap_element_query_position( mpPlaybin, GST_FORMAT_TIME, &gst_position ) )
+        if( gst_element_query_position( mpPlaybin, GST_FORMAT_TIME, &gst_position ) )
             position = gst_position / GST_SECOND;
     }
 
diff --git a/compilerplugins/clang/constantparam.numbers.results b/compilerplugins/clang/constantparam.numbers.results
index d4dfa2f8e17d..c080ebde2779 100644
--- a/compilerplugins/clang/constantparam.numbers.results
+++ b/compilerplugins/clang/constantparam.numbers.results
@@ -1,11 +1,3 @@
-avmedia/source/gstreamer/gstplayer.cxx:416
-    int wrap_element_query_position(struct _GstElement *,GstFormat,long *)
-    GstFormat format
-    3
-avmedia/source/gstreamer/gstplayer.cxx:422
-    int wrap_element_query_duration(struct _GstElement *,GstFormat,long *)
-    GstFormat format
-    3
 basctl/source/inc/dlged.hxx:77
     void basctl::DlgEdHint::DlgEdHint(enum basctl::DlgEdHint::Kind,class basctl::DlgEdObj *)
     enum basctl::DlgEdHint::Kind