diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-16 21:04:34 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-16 21:04:34 +0100 |
| commit | 384e705a9e1e41dd859d22a09293c65a28ef6535 (patch) | |
| tree | 51a9f8e40818533d81a7b26166c765f71a2d1936 /avmedia/source/viewer | |
| parent | 5430eb76db1ca40248717bcbee6b65e56c1a0e9b (diff) | |
avmedia: convert new to ::Create to get initial ref-counting right.
Change-Id: If7441005123ba1427d308b999af84b0c55a94a07
Diffstat (limited to 'avmedia/source/viewer')
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 402344780a8c..267e39fb7d6a 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -46,7 +46,7 @@ namespace avmedia { MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) : - mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) ) + mpImpl( VclPtr<priv::MediaWindowImpl>::Create( parent, this, bInternalMediaControl ) ) { mpImpl->Show(); } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 4d5eaa49b714..c84849b2dec3 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -156,7 +156,7 @@ MediaWindowImpl::MediaWindowImpl( vcl::Window* pParent, MediaWindow* pMediaWindo mpMediaWindow( pMediaWindow ), mpEvents( NULL ), mbEventTransparent(true), - mpMediaWindowControl( bInternalMediaControl ? new MediaWindowControl( this ) : NULL ), + mpMediaWindowControl( bInternalMediaControl ? VclPtr<MediaWindowControl>::Create( this ) : nullptr ), mpEmptyBmpEx( NULL ), mpAudioBmpEx( NULL ) { @@ -509,14 +509,14 @@ void MediaWindowImpl::onURLChanged() if( m_sMimeType == AVMEDIA_MIMETYPE_COMMON ) { mpChildWindow.disposeAndClear(); - mpChildWindow.reset(new MediaChildWindow(this) ); + mpChildWindow.reset(VclPtr<MediaChildWindow>::Create(this) ); } #if HAVE_FEATURE_GLTF else if ( m_sMimeType == AVMEDIA_MIMETYPE_JSON ) { SystemWindowData aWinData = OpenGLContext::generateWinData(this, false); mpChildWindow.disposeAndClear(); - mpChildWindow.reset(new MediaChildWindow(this,&aWinData)); + mpChildWindow.reset(VclPtr<MediaChildWindow>::Create(this,&aWinData)); mbEventTransparent = false; } #endif |