use 'id3demux'/'mad' for decoding mp3files instead of decodebin

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 0600062b4a9696e0f49b1cc4ed97808ede9cc5d1..19e66756fb40519856e2bf99fb7bd810ff032534 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -8,6 +8,7 @@
 
 #include <lib/actions/action.h>
 #include <lib/driver/rc.h>
+#include <lib/base/ioprio.h>
 #include <lib/base/ebase.h>
 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
@@ -57,15 +58,33 @@ int getPrevAsciiCode()
 
 void keyEvent(const eRCKey &key)
 {
+       static eRCKey last(0, 0, 0);
+       static int num_repeat;
+
        ePtr<eActionMap> ptr;
        eActionMap::getInstance(ptr);
+
+       if ((key.code == last.code) && (key.producer == last.producer) && key.flags & eRCKey::flagRepeat)
+               num_repeat++;
+       else
+       {
+               num_repeat = 0;
+               last = key;
+       }
+
+       if (num_repeat == 4)
+       {
+               ptr->keyPressed(key.producer->getIdentifier(), key.code, eRCKey::flagLong);
+               num_repeat++;
+       }
+
        if (key.flags & eRCKey::flagAscii)
        {
                prev_ascii_code = key.code;
-               ptr->keyPressed(0, 510 /* faked KEY_ASCII */, 0);
+               ptr->keyPressed(key.producer->getIdentifier(), 510 /* faked KEY_ASCII */, 0);
        }
        else
-               ptr->keyPressed(0, key.code, key.flags);
+               ptr->keyPressed(key.producer->getIdentifier(), key.code, key.flags);
 }
 
 /************************************************/
@@ -154,11 +173,13 @@ int main(int argc, char **argv)
        eTextPara::forceReplacementGlyph(0xfdf2);
        for (int i = 0xfe80; i < 0xff00; ++i)
                eTextPara::forceReplacementGlyph(i);
-       
 
        eWidgetDesktop dsk(eSize(720, 576));
        eWidgetDesktop dsk_lcd(eSize(132, 64));
        
+       dsk.setStyleID(0);
+       dsk_lcd.setStyleID(1);
+       
 /*     if (double_buffer)
        {
                eDebug(" - double buffering found, enable buffered graphics mode.");
@@ -185,13 +206,36 @@ int main(int argc, char **argv)
                /* redrawing is done in an idle-timer, so we have to set the context */
        dsk.setRedrawTask(main);
        dsk_lcd.setRedrawTask(main);
+       
+       
+       eDebug("Loading spinners...");
+       
+       {
+               int i;
+               ePtr<gPixmap> wait[4];
+               for (i=0; i<4; ++i)
+               {
+                       char filename[strlen(DATADIR) + 20];
+                       sprintf(filename, DATADIR "/enigma2/wait%d.png", i + 1);
+                       if (loadPNG(wait[i], filename))
+                       {
+                               eDebug("failed to load %s! (%m)", filename);
+                               continue;
+                       }
+               }
+               my_dc->setSpinner(eRect(100, 100, 105, 105), wait, 4);
+       }
+       
+       gRC::getInstance()->setSpinnerDC(my_dc);
 
        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
        printf("executing main\n");
        
        bsodCatchSignals();
-       
+
+       setIoPrio(IOPRIO_CLASS_BE, 3);
+
        python.execute("mytest", "__main__");
        
        if (exit_code == 5) /* python crash */
@@ -230,10 +274,3 @@ void quitMainloop(int exitCode)
        exit_code = exitCode;
        eApp->quit(0);
 }
-
-void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement)
-{
-       fontRenderClass::getInstance()->AddFont(filename, alias, scale_factor);
-       if (is_replacement)
-               eTextPara::setReplacementFont(alias);
-}