From fb8a3fac5d448451794804a7470be45fa14da453 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 10 Dec 2015 08:06:06 +0100 Subject: loplugin:nullptr: More NULL -> nullptr automatic rewrite Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d --- avmedia/source/gstreamer/gstframegrabber.cxx | 4 ++-- avmedia/source/gstreamer/gstplayer.cxx | 20 ++++++++++---------- avmedia/source/vlc/wrapper/SymbolLoader.hxx | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'avmedia') diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index cd2eadf9e9a8..9608e7e36c36 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -127,12 +127,12 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe // synchronously fetch the frame #ifdef AVMEDIA_GST_0_10 - g_signal_emit_by_name( pSink, "pull-preroll", &pBuf, NULL ); + g_signal_emit_by_name( pSink, "pull-preroll", &pBuf, nullptr ); if( pBuf ) pCaps = GST_BUFFER_CAPS( pBuf ); #else GstSample *pSample = nullptr; - g_signal_emit_by_name( pSink, "pull-preroll", &pSample, NULL ); + g_signal_emit_by_name( pSink, "pull-preroll", &pSample, nullptr ); if( pSample ) { diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 6dd0f5c3538d..4e220866f8d1 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -458,7 +458,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) GST_MESSAGE_TYPE_NAME( message ), (int)mnWindowID ); if( mpXOverlay ) g_object_unref( G_OBJECT ( mpXOverlay ) ); - g_object_set( GST_MESSAGE_SRC( message ), "force-aspect-ratio", FALSE, NULL ); + g_object_set( GST_MESSAGE_SRC( message ), "force-aspect-ratio", FALSE, nullptr ); mpXOverlay = GST_VIDEO_OVERLAY( GST_MESSAGE_SRC( message ) ); g_object_ref( G_OBJECT ( mpXOverlay ) ); if ( mnWindowID != 0 ) @@ -489,7 +489,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) if( mnWidth == 0 ) { GList *pStreamInfo = nullptr; - g_object_get( G_OBJECT( mpPlaybin ), "stream-info", &pStreamInfo, NULL ); + g_object_get( G_OBJECT( mpPlaybin ), "stream-info", &pStreamInfo, nullptr ); for ( ; pStreamInfo != nullptr; pStreamInfo = pStreamInfo->next) { GObject *pInfo = G_OBJECT( pStreamInfo->data ); @@ -498,7 +498,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) continue; int nType; - g_object_get( pInfo, "type", &nType, NULL ); + g_object_get( pInfo, "type", &nType, nullptr ); GEnumValue *pValue = g_enum_get_value( G_PARAM_SPEC_ENUM( g_object_class_find_property( G_OBJECT_GET_CLASS( pInfo ), "type" ) )->enum_class, nType ); @@ -506,7 +506,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) GstStructure *pStructure; GstPad *pPad; - g_object_get( pInfo, "object", &pPad, NULL ); + g_object_get( pInfo, "object", &pPad, nullptr ); pStructure = gst_caps_get_structure( GST_PAD_CAPS( pPad ), 0 ); if( pStructure ) { gst_structure_get_int( pStructure, "width", &mnWidth ); @@ -542,7 +542,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) if( gst_structure_get( gst_caps_get_structure( caps, 0 ), "width", G_TYPE_INT, &w, "height", G_TYPE_INT, &h, - NULL ) ) { + nullptr ) ) { mnWidth = w; mnHeight = h; @@ -585,14 +585,14 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink ) mpPlaybin = gst_element_factory_make( "playbin", nullptr ); if( pSink != nullptr ) // used for getting preferred size etc. { - g_object_set( G_OBJECT( mpPlaybin ), "video-sink", pSink, NULL ); + g_object_set( G_OBJECT( mpPlaybin ), "video-sink", pSink, nullptr ); mbFakeVideo = true; } else mbFakeVideo = false; OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ); - g_object_set( G_OBJECT( mpPlaybin ), "uri", ascURL.getStr() , NULL ); + g_object_set( G_OBJECT( mpPlaybin ), "uri", ascURL.getStr() , nullptr ); pBus = gst_element_get_bus( mpPlaybin ); if (mbWatchID) @@ -782,7 +782,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet ) nVolume = 0.0; } - g_object_set( G_OBJECT( mpPlaybin ), "volume", nVolume, NULL ); + g_object_set( G_OBJECT( mpPlaybin ), "volume", nVolume, nullptr ); mbMuted = bSet; } @@ -812,7 +812,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) // change volume if( !mbMuted && mpPlaybin ) { - g_object_set( G_OBJECT( mpPlaybin ), "volume", (gdouble) mnUnmutedVolume, NULL ); + g_object_set( G_OBJECT( mpPlaybin ), "volume", (gdouble) mnUnmutedVolume, nullptr ); } } @@ -828,7 +828,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB() if( mpPlaybin ) { double nGstVolume = 0.0; - g_object_get( G_OBJECT( mpPlaybin ), "volume", &nGstVolume, NULL ); + g_object_get( G_OBJECT( mpPlaybin ), "volume", &nGstVolume, nullptr ); nVolumeDB = (sal_Int16) ( 20.0*log10 ( nGstVolume ) ); } diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index 3cf33b6afb2a..8e3faf41b975 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -79,7 +79,7 @@ namespace if ( !aMethod ) { SAL_WARN("avmedia", "Cannot load method " << pMap[ i ].symName); - *pMap[ i ].refValue = NULL; + *pMap[ i ].refValue = nullptr; return false; } else -- cgit