diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-06 09:17:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-06 12:05:28 +0200 |
| commit | ac87cfdf263d2abd97b32857534d0f749b7c4479 (patch) | |
| tree | 05fa0c8d1632d9ed1b2cf3669ddcfee0b395bf23 /avmedia | |
| parent | 6a789e617ed07bfddc516c8fc0cf94cd6dfe7250 (diff) | |
Replace SystemEnvData pToolkit/pPlatformName strings with enums
(and streamline those data members' names)
Change-Id: Ifdd596c7a54dd507045d412c30b463468c2f798b
Reviewed-on: https://gerrit.libreoffice.org/80313
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 44e7a04dedf1..4612c1053998 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -850,13 +850,10 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co if (!pEnvData) return nullptr; - OUString aToolkit = OUString::createFromAscii(pEnvData->pToolkit); - OUString aPlatform = OUString::createFromAscii(pEnvData->pPlatformName); - // tdf#124027: the position of embedded window is identical w/ the position // of media object in all other vclplugs (kf5, gen), in gtk3 w/o gtksink it // needs to be translated - if (aToolkit == "gtk3") + if (pEnvData->toolkit == SystemEnvData::Toolkit::Gtk3) { Point aPoint = pParentWindow->GetPosPixel(); maArea.X = aPoint.getX(); @@ -868,12 +865,12 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co GstElement *pVideosink = static_cast<GstElement*>(pParentWindow->CreateGStreamerSink()); if (pVideosink) { - if (aToolkit == "gtk3") + if (pEnvData->toolkit == SystemEnvData::Toolkit::Gtk3) mbUseGtkSink = true; } else { - if (aPlatform == "wayland") + if (pEnvData->platform == SystemEnvData::Platform::Wayland) pVideosink = gst_element_factory_make("waylandsink", "video-output"); else pVideosink = gst_element_factory_make("autovideosink", "video-output"); |