Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / gui / evideo.cpp

diff --git a/lib/gui/evideo.cpp b/lib/gui/evideo.cpp
index 02d8a5293f4c8d5e1954ecdcb4d5d1eadae78983..328d95e484c8e56f628b3e5ebd76806b0a5c2764 100644 (file)
--- a/lib/gui/evideo.cpp
+++ b/lib/gui/evideo.cpp
@@ -2,6 +2,7 @@
 
 eVideoWidget::eVideoWidget(eWidget *parent): eWidget(parent)
 {
+       m_decoder = 1;
        parent->setPositionNotifyChild(1);
 }
 
@@ -12,23 +13,36 @@ int eVideoWidget::event(int event, void *data, void *data2)
        case evtChangedPosition:
        case evtChangedSize:
        case evtParentChangedPosition:
-               eDebug("position is now ...");
-               updatePosition();
+       case evtParentVisibilityChanged:
+               updatePosition(!isVisible());
+               break;
        }
        return eWidget::event(event, data, data2);
 }
 
+eVideoWidget::~eVideoWidget()
+{
+       updatePosition(1);
+}
 
-void eVideoWidget::updatePosition()
+void eVideoWidget::updatePosition(int disable)
 {
-       ePoint abspos = getAbsolutePosition();
-       eDebug("position is %d %d -> %d %d", abspos.x(), abspos.y(), size().width(), size().height());
-       
+       eRect pos(0, 0, 0, 0);
+       if (!disable)
+               pos = eRect(getAbsolutePosition(), size());
+
+       if (m_cur_pos == pos)
+               return;
+
+       m_cur_pos = pos;
+
+       eDebug("position is %d %d -> %d %d", pos.left(), pos.top(), pos.width(), pos.height());
+
        for (int i=0; i<4; ++i)
        {
-               char *targets[]={"left", "top", "width", "height"};
+               const char *targets[]={"left", "top", "width", "height"};
                char filename[128];
-               snprintf(filename, 128, "/proc/stb/vmpeg/%d/dst_%s", 1, targets[i]);
+               snprintf(filename, 128, "/proc/stb/vmpeg/%d/dst_%s", m_decoder, targets[i]);
                FILE *f = fopen(filename, "w");
                if (!f)
                {
@@ -38,13 +52,18 @@ void eVideoWidget::updatePosition()
                int val = 0;
                switch (i)
                {
-               case 0: val = abspos.x(); break;
-               case 1: val = abspos.y(); break;
-               case 2: val = size().width(); break;
-               case 3: val = size().height(); break;
+               case 0: val = pos.left(); break;
+               case 1: val = pos.top(); break;
+               case 2: val = pos.width(); break;
+               case 3: val = pos.height(); break;
                }
                fprintf(f, "%08x\n", val);
                fclose(f);
                eDebug("%s %08x", filename, val);
        }
 }
+
+void eVideoWidget::setDecoder(int decoder)
+{
+       m_decoder = decoder;
+}