skins2: drag&drop (small tweak)

[vlc] / modules / gui / skins2 / x11 / x11_timer.cpp

diff --git a/modules/gui/skins2/x11/x11_timer.cpp b/modules/gui/skins2/x11/x11_timer.cpp
index ce5904ce7c9c05869ceb64be82826e4de77bed63..6f640c5c07067a1665f53b9baee56ef90b0337c5 100644 (file)
--- a/modules/gui/skins2/x11/x11_timer.cpp
+++ b/modules/gui/skins2/x11/x11_timer.cpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * x11_timer.cpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: x11_timer.cpp,v 1.1 2004/01/03 23:31:34 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,20 +19,21 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef X11_SKINS
 
 #include <unistd.h>
-#include <fcntl.h>
+#include <poll.h>
 
 #include "x11_timer.hpp"
 #include "x11_factory.hpp"
+#include "../commands/cmd_generic.hpp"
 
 
-X11Timer::X11Timer( intf_thread_t *pIntf, const Callback &rCallback ):
-    OSTimer( pIntf ), m_callback( rCallback )
+X11Timer::X11Timer( intf_thread_t *pIntf, CmdGeneric &rCmd ):
+    OSTimer( pIntf ), m_rCommand( rCmd )
 {
     // Get the instance of timer loop
     X11Factory *m_pOsFactory = (X11Factory*)(OSFactory::instance( pIntf ) );
@@ -71,7 +72,7 @@ bool X11Timer::execute()
 {
     m_nextDate += m_interval;
     // Execute the callback
-    (*(m_callback.getFunc()))( m_callback.getObj() );
+    m_rCommand.execute();
 
     return !m_oneShot;
 }
@@ -109,7 +110,7 @@ void X11TimerLoop::waitNextTimer()
 
     // Find the next timer to execute
     list<X11Timer*>::const_iterator timer;
-    for( timer = m_timers.begin(); timer != m_timers.end(); timer++ )
+    for( timer = m_timers.begin(); timer != m_timers.end(); ++timer )
     {
         mtime_t timerDate = (*timer)->getNextDate();
         if( timerDate < nextDate )
@@ -145,20 +146,13 @@ void X11TimerLoop::waitNextTimer()
 
 bool X11TimerLoop::sleep( int delay )
 {
-    // Timeout delay
-    struct timeval tv;
-    tv.tv_sec = delay / 1000;
-    tv.tv_usec = 1000 * (delay % 1000);
-
-    // FD set for select()
-    fd_set rfds;
-    FD_ZERO( &rfds );
-    FD_SET( m_connectionNumber, &rfds );
+    struct pollfd ufd;
+    memset( &ufd, 0, sizeof (ufd) );
+    ufd.fd = m_connectionNumber;
+    ufd.events = POLLIN;
 
     // Wait for an X11 event, or timeout
-    int num = select( m_connectionNumber + 1, &rfds, NULL, NULL, &tv );
-
-    return ( num > 0 );
+    return poll( &ufd, 1, delay ) > 0;
 }