]> git.vomp.tv Git - vompclient.git/commitdiff
Windows updates
authorChris Tallon <chris@vomp.tv>
Sun, 15 Mar 2009 14:51:19 +0000 (14:51 +0000)
committerChris Tallon <chris@vomp.tv>
Sun, 15 Mar 2009 14:51:19 +0000 (14:51 +0000)
media.cc
vmedialist.cc

index 6361585fec6e5b415b7cbc8ac926fc5c5472841b..f37661494dcf9a3ea3bfbf3db4914c818b3ee437 100644 (file)
--- a/media.cc
+++ b/media.cc
@@ -239,7 +239,8 @@ char * Media::getTimeString(char * buffer) const {
 #ifndef _MSC_VER
   strftime(buffer,TIMEBUFLEN, "%0g/%0m/%0d %0H:%0M ", btime);
 #else
-  strftime(buffer,TIMEBUFLEN, "%0G/%0m/%0d %0H:%0M ", btime);
+  strftime(buffer,TIMEBUFLEN, "%Y/%m/%d %H:%M ", btime);
+  
 #endif
   }
   else {
@@ -465,3 +466,4 @@ int MediaList::deserializeImpl(SerializeBuffer *b) {
 
 
 
+
index cb73b9b9cf9ab81deab8c22ce3ca9a4ed4c0748a..08479c8929cdf925af961ce1d1ff17ed2e6c324e 100644 (file)
@@ -350,7 +350,9 @@ VMediaList::VMediaList()
   }
   playingAll=false;
   //init additional providers
+#ifndef WIN32
   LocalMediaFile::init();
+#endif
 }
 
 
@@ -819,6 +821,7 @@ int VMediaList::handleCommand(int command)
           playAudio(command==Remote::PLAY,true,true);
         break;
         case MEDIA_TYPE_VIDEO: {
+#ifndef WIN32 //Only DVB style MPEG is supported by the Windows Part!
         Log::getInstance()->log("VMediaList", Log::DEBUG, "play video file %s",
           media->getFileName());
         //OK - simply today
@@ -840,6 +843,7 @@ int VMediaList::handleCommand(int command)
         BoxStack::getInstance()->update(v);
         v->go(false);
         //play video
+#endif
       }break;
         case MEDIA_TYPE_PICTURE:
         Log::getInstance()->log("VMediaList", Log::DEBUG, "show picture file %s",
@@ -1069,12 +1073,14 @@ void VMediaList::processMessage(Message* m)
       sl.draw();
       doShowingBar();
       boxstack->update(this);
+      updateSelection();
     }
   }
   else if (m->message == Message::MOUSE_LBDOWN)
   {
     if (sl.mouseLBDOWN((m->parameter>>16)-getScreenX(),(m->parameter&0xFFFF)-getScreenY()))
     {
+      updateSelection();
       boxstack->handleCommand(Remote::OK); //simulate OK press
     }
     else
@@ -1204,3 +1210,4 @@ void VMediaList::timercall(int ref) {
   }
 }
  
+