Browse Source

qt: expose type of compositor through its interface

pull/121/head
Prince Gupta 5 years ago
committed by Jean-Baptiste Kempf
parent
commit
d118f1d0fc
  1. 8
      modules/gui/qt/maininterface/compositor.hpp
  2. 5
      modules/gui/qt/maininterface/compositor_dcomp.cpp
  3. 2
      modules/gui/qt/maininterface/compositor_dcomp.hpp
  4. 5
      modules/gui/qt/maininterface/compositor_dummy.cpp
  5. 2
      modules/gui/qt/maininterface/compositor_dummy.hpp
  6. 6
      modules/gui/qt/maininterface/compositor_win7.cpp
  7. 2
      modules/gui/qt/maininterface/compositor_win7.hpp

8
modules/gui/qt/maininterface/compositor.hpp

@ -34,6 +34,12 @@ namespace vlc {
class Compositor {
public:
enum Type
{
DummyCompositor,
Win7Compositor,
DirectCompositionCompositor
};
virtual ~Compositor() = default;
@ -42,6 +48,8 @@ public:
virtual bool setupVoutWindow(vout_window_t *p_wnd) = 0;
virtual Type type() const = 0;
//factory
static Compositor* createCompositor(intf_thread_t *p_intf);
};

5
modules/gui/qt/maininterface/compositor_dcomp.cpp

@ -326,4 +326,9 @@ bool CompositorDirectComposition::setupVoutWindow(vout_window_t *p_wnd)
return true;
}
Compositor::Type CompositorDirectComposition::type() const
{
return Compositor::DirectCompositionCompositor;
}
}

2
modules/gui/qt/maininterface/compositor_dcomp.hpp

@ -52,6 +52,8 @@ public:
bool setupVoutWindow(vout_window_t *p_wnd) override;
Type type() const override;
private slots:
void onSurfacePositionChanged(QPointF position);

5
modules/gui/qt/maininterface/compositor_dummy.cpp

@ -74,4 +74,9 @@ bool CompositorDummy::setupVoutWindow(vout_window_t*)
return false;
}
Compositor::Type CompositorDummy::type() const
{
return Compositor::DummyCompositor;
}
}

2
modules/gui/qt/maininterface/compositor_dummy.hpp

@ -42,6 +42,8 @@ public:
bool setupVoutWindow(vout_window_t *p_wnd) override;
Type type() const override;
protected:
intf_thread_t *m_intf;

6
modules/gui/qt/maininterface/compositor_win7.cpp

@ -273,6 +273,12 @@ bool CompositorWin7::setupVoutWindow(vout_window_t *p_wnd)
return true;
}
Compositor::Type CompositorWin7::type() const
{
return Compositor::Win7Compositor;
}
bool CompositorWin7::eventFilter(QObject*, QEvent* ev)
{
switch (ev->type())

2
modules/gui/qt/maininterface/compositor_win7.hpp

@ -52,6 +52,8 @@ public:
virtual void destroyMainInterface() override;
virtual bool setupVoutWindow(vout_window_t*) override;
Type type() const override;
protected:
bool eventFilter(QObject *obj, QEvent *ev) override;

Loading…
Cancel
Save