Ticket #1590: libmythui-1-11-06.patch
File libmythui-1-11-06.patch, 2.9 KB (added by , 17 years ago) |
---|
-
mythmainwindow.cpp
46 46 /* from libmyth */ 47 47 #include "screensaver.h" 48 48 #include "mythdialogs.h" 49 #include "mythmediamonitor.h" 49 #ifndef CONFIG_CYGWIN 50 #include "monitor.h" 51 #endif 50 52 51 53 #define GESTURE_TIMEOUT 1000 52 54 … … 991 993 int mediaType, 992 994 const QString &extensions) 993 995 { 996 #ifndef CONFIG_CYGWIN 994 997 if (d->mediaHandlerMap.count(destination) == 0) 995 998 { 996 999 MHData mhd = { callback, mediaType, destination, description }; … … 999 1002 .arg(destination).arg(QString("ext(%1)").arg(extensions))); 1000 1003 1001 1004 d->mediaHandlerMap[destination] = mhd; 1002 1005 1003 1006 MediaMonitor *mon = MediaMonitor::GetMediaMonitor(); 1004 1007 if (mon && !extensions.isEmpty()) 1005 1008 mon->MonitorRegisterExtensions(mediaType, extensions); … … 1009 1012 VERBOSE(VB_GENERAL, QString("%1 is already registered as a media " 1010 1013 "handler.").arg(destination)); 1011 1014 } 1015 #endif 1012 1016 } 1013 1017 1014 1018 void MythMainWindow::RegisterMediaPlugin(const QString &name, … … 1214 1218 else 1215 1219 QApplication::sendEvent(key_target, &key); 1216 1220 } 1221 #ifndef CONFIG_CYGWIN 1217 1222 else if (ce->type() == kMediaEventType) 1218 1223 { 1219 1224 MediaEvent *media_event = (MediaEvent*)ce; … … 1260 1265 mon->Unlock(pDev); 1261 1266 } 1262 1267 } 1268 #endif 1263 1269 #if defined(USE_LIRC) || defined(USING_APPLEREMOTE) 1264 1270 else if (ce->type() == kLircKeycodeEventType && !d->ignore_lirc_keys) 1265 1271 { -
myththemedmenu.cpp
1868 1868 } 1869 1869 lastbutton = NULL; 1870 1870 } 1871 #ifndef CONFIG_CYGWIN 1871 1872 else if (action == "EJECT") 1872 1873 { 1873 1874 MediaMonitor *mon = MediaMonitor::GetMediaMonitor(); 1874 1875 if (mon) 1875 1876 mon->ChooseAndEjectMedia(); 1876 1877 } 1878 #endif 1877 1879 else 1878 1880 handled = false; 1879 1881 } … … 2076 2078 wantpop = true; 2077 2079 } 2078 2080 } 2081 #ifndef CONFIG_CYGWIN 2079 2082 else if (action.left(5) == "EJECT") 2080 2083 { 2081 2084 MediaMonitor *mon = MediaMonitor::GetMediaMonitor(); 2082 2085 if (mon) 2083 2086 mon->ChooseAndEjectMedia(); 2084 2087 } 2088 #endif 2085 2089 else if (action.left(5) == "JUMP ") 2086 2090 { 2087 2091 QString rest = action.right(action.length() - 5); -
libmythui.pro
63 63 QMAKE_LFLAGS_SHLIB += -seg1addr 0xCC000000 64 64 } 65 65 66 cygwin { 67 DEFINES += CONFIG_CYGWIN 68 } 69 66 70 using_joystick_menu { 67 71 DEFINES += USE_JOYSTICK_MENU 68 72 }