Ticket #1590: cygwin-may07.diff
File cygwin-may07.diff, 20.4 KB (added by , 17 years ago) |
---|
-
libs/libmythtv/eit.cpp
142 142 " manualid = 0 AND " 143 143 " ( ( starttime >= :STIME1 AND starttime < :ETIME1 ) OR " 144 144 " ( endtime > :STIME2 AND endtime <= :ETIME2 ) )"); 145 query.bindValue(":CHANID", chanid);145 query.bindValue(":CHANID", (uint)chanid); 146 146 query.bindValue(":STIME1", starttime); 147 147 query.bindValue(":ETIME1", endtime); 148 148 query.bindValue(":STIME2", starttime); … … 355 355 "WHERE chanid = :CHANID AND " 356 356 " starttime = :OLDSTART "); 357 357 358 query.bindValue(":CHANID", chanid);358 query.bindValue(":CHANID", (uint)chanid); 359 359 query.bindValue(":OLDSTART", match.starttime); 360 360 query.bindValue(":TITLE", ltitle.utf8()); 361 361 query.bindValue(":SUBTITLE", lsubtitle.utf8()); … … 515 515 516 516 QString cattype = myth_category_type_to_string(category_type); 517 517 518 query.bindValue(":CHANID", chanid);518 query.bindValue(":CHANID", (uint)chanid); 519 519 query.bindValue(":TITLE", title.utf8()); 520 520 query.bindValue(":SUBTITLE", subtitle.utf8()); 521 521 query.bindValue(":DESCRIPTION", description.utf8()); … … 561 561 "FROM channel " 562 562 "WHERE chanid = :CHANID"); 563 563 564 query.bindValue(":CHANID", chanid);564 query.bindValue(":CHANID", (uint)chanid); 565 565 566 566 if (!query.exec()) 567 567 { -
libs/libmythtv/NuppelVideoPlayer.cpp
73 73 #undef GetFileSize 74 74 #ifdef CONFIG_CYGWIN 75 75 #undef DialogBox 76 #undef GetCurrentTime 76 77 #endif 77 78 #endif 78 79 … … 5608 5609 if (ringBuffer->isDVD()) 5609 5610 { 5610 5611 if (!ringBuffer->DVD()->IsInMenu()) 5611 #ifndef CONFIG_CYGWIN5612 5612 secsplayed = ringBuffer->DVD()->GetCurrentTime(); 5613 #else5614 // DVD playing non-functional under windows for now5615 secsplayed = 0;5616 #endif5617 5613 } 5618 5614 else 5619 5615 secsplayed = ((float)framesPlayed / video_frame_rate); -
libs/libmythtv/NuppelVideoRecorder.cpp
735 735 */ 736 736 bool NuppelVideoRecorder::MJPEGInit(void) 737 737 { 738 #if defined(CONFIG_CYGWIN) 739 VERBOSE(VB_IMPORTANT, LOC_ERR + "Not supported under Cygwin yet" + ENO); 740 #else 738 741 bool we_opened_fd = false; 739 742 int init_fd = fd; 740 743 if (init_fd < 0) … … 777 780 } 778 781 779 782 VERBOSE(VB_IMPORTANT, LOC_ERR + "MJPEG not supported by device"); 783 #endif 780 784 return false; 781 785 } 782 786 … … 895 899 896 900 bool NuppelVideoRecorder::Open(void) 897 901 { 902 #if defined(CONFIG_CYGWIN) 903 VERBOSE(VB_IMPORTANT, LOC_ERR + "Not supported under Cygwin yet" + ENO); 904 errored = true; 905 return false; 906 #else 898 907 if (channelfd>0) 899 908 return true; 900 909 … … 970 979 971 980 channelfd = fd; 972 981 return true; 982 #endif 973 983 } 974 984 975 985 void NuppelVideoRecorder::StartRecording(void) 976 986 { 987 #if defined(CONFIG_CYGWIN) 988 VERBOSE(VB_IMPORTANT, LOC_ERR + "Not supported under Cygwin yet" + ENO); 989 #else 977 990 if (lzo_init() != LZO_E_OK) 978 991 { 979 992 VERBOSE(VB_IMPORTANT, LOC_ERR + "lzo_init() failed, exiting"); … … 1214 1227 1215 1228 recording = false; 1216 1229 close(fd); 1230 #endif 1217 1231 } 1218 1232 1219 1233 void NuppelVideoRecorder::DoV4L2(void) 1220 1234 { 1235 #if defined(CONFIG_CYGWIN) 1236 VERBOSE(VB_IMPORTANT, LOC_ERR + "Not supported under Cygwin yet" + ENO); 1237 #else 1221 1238 struct v4l2_format vfmt; 1222 1239 struct v4l2_buffer vbuf; 1223 1240 struct v4l2_requestbuffers vrbuf; … … 1542 1559 recording = false; 1543 1560 close(fd); 1544 1561 close(channelfd); 1562 #endif 1545 1563 } 1546 1564 1547 1565 void NuppelVideoRecorder::DoMJPEG(void) 1548 1566 { 1567 #if defined(CONFIG_CYGWIN) 1568 VERBOSE(VB_IMPORTANT, LOC_ERR + "Not supported under Cygwin yet" + ENO); 1569 #else 1549 1570 struct mjpeg_params bparm; 1550 1571 1551 1572 if (ioctl(fd, MJPIOC_G_PARAMS, &bparm) < 0) … … 1673 1694 1674 1695 recording = false; 1675 1696 close(fd); 1697 #endif 1676 1698 } 1677 1699 1678 1700 int NuppelVideoRecorder::SpawnChildren(void) … … 2590 2612 2591 2613 void NuppelVideoRecorder::doVbiThread(void) 2592 2614 { 2615 #if defined(CONFIG_CYGWIN) 2616 VERBOSE(VB_IMPORTANT, LOC_ERR + "Not supported under Cygwin yet" + ENO); 2617 #else 2593 2618 //VERBOSE(VB_IMPORTANT, LOC + "vbi begin"); 2594 2619 struct VBIData vbicallbackdata; 2595 2620 struct vbi *pal_tt = NULL; … … 2730 2755 cc_close(ntsc_cc); 2731 2756 2732 2757 //VERBOSE(VB_RECORD, LOC + "vbi end"); 2758 #endif 2733 2759 } 2734 2760 2735 2761 -
libs/libmythtv/DVDRingBuffer.cpp
1307 1307 VERBOSE(VB_PLAYBACK, LOC + "Limiting DVD Speed Successful"); 1308 1308 #else 1309 1309 (void)speed; 1310 (void)device;1311 1310 #endif 1312 1311 } 1313 1312 -
libs/libmythtv/videoout_dx.h
1 1 #ifndef VIDEOOUT_DX_H_ 2 2 #define VIDEOOUT_DX_H_ 3 3 4 /* ACK! <windows.h> and <ddraw.h> should only be in cpp's compiled in4 /* HACK! <windows.h> and <ddraw.h> should only be in cpp's compiled in 5 5 * windows only. Some of the variables in VideoOutputDX need to be 6 6 * moved to a private class before removing these includes though. 7 7 */ -
libs/libmythtv/libmythtv.pro
42 42 } 43 43 44 44 cygwin { 45 QMAKE_EXTENSION_SHLIB=$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 45 TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 46 TARGETDEPS += ../libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 47 TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 48 TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 49 } else { 50 TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 51 TARGETDEPS += ../libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 52 TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 53 TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 46 54 } 47 55 48 TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}49 TARGETDEPS += ../libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}50 TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}51 TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}52 56 TARGETDEPS += ../libmythmpeg2/libmythmpeg2-$${LIBVERSION}.$${QMAKE_EXTENSION_LIB} 53 57 TARGETDEPS += ../libmythdvdnav/libmythdvdnav-$${LIBVERSION}.$${QMAKE_EXTENSION_LIB} 54 58 55 56 59 DEFINES += _LARGEFILE_SOURCE 57 60 QMAKE_CXXFLAGS_RELEASE += $${FREETYPE_CFLAGS} 58 61 QMAKE_CXXFLAGS_DEBUG += $${FREETYPE_CFLAGS} -
libs/libmythtv/videodev_myth.h
11 11 typedef uint8_t __u8; 12 12 typedef uint32_t __u64; 13 13 typedef int32_t __s64; // HACK. Non 64bit FreeBSD kernels require this for ioctls 14 #elif defined(CONFIG_CYGWIN) 15 #include <sys/types.h> 16 typedef uint32_t __u32; 17 typedef uint16_t __u16; 18 typedef int32_t __s32; 19 typedef uint8_t __u8; 20 typedef uint64_t __u64; 21 typedef int64_t __s64; 14 22 #else 15 23 #include <linux/types.h> 16 24 #include <linux/version.h> -
libs/libmythtv/videoout_dx.cpp
18 18 #include "../libavcodec/avcodec.h" 19 19 } 20 20 21 #define PRINT_FOURCC(c) ((char) (c & 0xFF)) << ((char) ((c >> 8) & 0xFF)) << ((char) ((c >> 16) & 0xFF)) << ((char) ((c >> 24) & 0xFF)) 22 21 23 const int kNumBuffers = 31; 22 24 const int kNeedFreeFrames = 1; 23 25 const int kPrebufferFramesNormal = 12; … … 159 161 VideoOutput::Init(width, height, aspect, winid, 160 162 winx, winy, winw, winh, embedid); 161 163 162 wnd = winid;164 wnd = (HWND)winid; 163 165 164 166 XJ_width = width; 165 167 XJ_height = height; … … 1349 1351 int diff_x = display_visible_rect.left(); 1350 1352 diff_x -= display_video_rect.left(); 1351 1353 int diff_w = display_video_rect.width(); 1352 diff_x -= display_visible_rect.width() 1354 diff_x -= display_visible_rect.width(); 1353 1355 1354 1356 rect_src.left += (XJ_width * diff_x) / display_video_rect.width(); 1355 1357 rect_src.right -= ((XJ_width * (diff_w - diff_x)) / … … 1367 1369 rect_dest.top = display_visible_rect.top(); 1368 1370 rect_dest.bottom = display_visible_rect.bottom(); 1369 1371 1372 int diff_x = display_visible_rect.left(); 1373 diff_x -= display_video_rect.left(); 1370 1374 int diff_y = display_visible_rect.top(); 1371 1375 diff_y -= display_video_rect.top(); 1372 1376 int diff_h = display_video_rect.height(); -
libs/libmythui/libmythui.pro
71 71 DEFINES += USE_LIRC 72 72 } 73 73 74 cygwin:DEFINES += _WIN32 74 cygwin { 75 DEFINES += _WIN32 76 LIBS += $$LOCAL_LIBDIR_X11 77 } 78 No newline at end of file -
libs/libmyth/util-x11.cpp
6 6 #include "config.h" // for CONFIG_DARWIN 7 7 #include "mythcontext.h" 8 8 9 #ifdef _WIN32 10 #undef Q_WS_X11 /* Even if we have an X server in WIN32, don't use X11... */ 11 #endif // _WIN32 12 9 13 QMutex x11_lock; 10 14 11 15 #ifdef Q_WS_X11 -
libs/libmyth/libmyth.pro
77 77 DEFINES += _WIN32 78 78 #HEADERS += mediamonitor-windows.h 79 79 #SOURCES += mediamonitor-windows.cpp 80 LIBS += $$LOCAL_LIBDIR_X11 80 81 } 81 82 82 83 macx { -
libs/libmyth/mediamonitor-windows.h
8 8 : MediaMonitor(par, interval, allowEject) {}; 9 9 10 10 QStringList GetCDROMBlockDevices(void); 11 virtual bool AddDevice(MythMediaDevice* pDevice); 11 12 }; 12 13 #endif // MYTH_MEDIA_MONITOR_WINDOWS_H -
libs/libmyth/mediamonitor-windows.cpp
59 59 60 60 return list; 61 61 } 62 63 // Given a media deivce add it to our collection. 64 bool MediaMonitorUnix::AddDevice(MythMediaDevice* pDevice) 65 { 66 if ( ! pDevice ) 67 { 68 VERBOSE(VB_IMPORTANT, "Error - MediaMonitorUnix::AddDevice(null)"); 69 return false; 70 } 71 72 dev_t new_rdev; 73 struct stat sb; 74 75 if (stat(pDevice->getDevicePath(), &sb) < 0) 76 { 77 VERBOSE(VB_IMPORTANT, "MediaMonitorUnix::AddDevice() -- " + 78 QString("Failed to stat '%1'") 79 .arg(pDevice->getDevicePath()) + ENO); 80 81 return false; 82 } 83 new_rdev = sb.st_rdev; 84 85 // 86 // Check if this is a duplicate of a device we have already added 87 // 88 QValueList<MythMediaDevice*>::const_iterator itr = m_Devices.begin(); 89 for (; itr != m_Devices.end(); ++itr) 90 { 91 if (stat((*itr)->getDevicePath(), &sb) < 0) 92 { 93 VERBOSE(VB_IMPORTANT, "MediaMonitorUnix::AddDevice() -- " + 94 QString("Failed to stat '%1'") 95 .arg(pDevice->getDevicePath()) + ENO); 96 97 return false; 98 } 99 100 if (sb.st_rdev == new_rdev) 101 { 102 VERBOSE(VB_MEDIA, "MediamonitorUnix::AddDevice() -- " + 103 QString("Not adding '%1', it appears to be a duplicate.") 104 .arg(pDevice->getDevicePath())); 105 106 return false; 107 } 108 } 109 110 LookupModel(pDevice); 111 112 QMutexLocker locker(&m_DevicesLock); 113 114 connect(pDevice, SIGNAL(statusChanged(MediaStatus, MythMediaDevice*)), 115 this, SLOT(mediaStatusChanged(MediaStatus, MythMediaDevice*))); 116 m_Devices.push_back( pDevice ); 117 m_UseCount[pDevice] = 0; 118 119 return true; 120 } -
libs/libmythupnp/ssdp.cpp
52 52 53 53 // Setup SearchSocket 54 54 55 m_Sockets[ SocketIdx_Search ]->bind( INADDR_ANY, m_nSearchPort );55 m_Sockets[ SocketIdx_Search ]->bind( (uint)INADDR_ANY, m_nSearchPort ); 56 56 57 57 m_pNotifyTask = NULL; 58 58 -
libs/libmythupnp/libmythupnp.pro
49 49 } 50 50 51 51 cygwin { 52 QMAKE_EXTENSION_SHLIB=$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 52 TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 53 TARGETDEPS += ../libmythtv/libmythtv-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 54 TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 55 TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 56 } else { 57 TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 58 TARGETDEPS += ../libmythtv/libmythtv-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 59 TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 60 TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 53 61 } 54 62 55 TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}56 TARGETDEPS += ../libmythtv/libmythtv-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}57 TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}58 TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}59 60 63 inc.path = $${PREFIX}/include/mythtv/upnp/ 61 64 62 65 inc.files = httprequest.h upnp.h ssdp.h taskqueue.h bufferedsocketdevice.h -
programs/mythuitest/mythuitest.pro
17 17 isEmpty(QMAKE_EXTENSION_LIB) { 18 18 QMAKE_EXTENSION_LIB=a 19 19 } 20 TARGETDEPS += ../../libs/libmythui/libmythui-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 21 TARGETDEPS += ../../libs/libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 20 cygwin { 21 TARGETDEPS += ../../libs/libmythui/libmythui-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 22 TARGETDEPS += ../../libs/libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 23 } else { 24 TARGETDEPS += ../../libs/libmythui/libmythui-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 25 TARGETDEPS += ../../libs/libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 26 } 22 27 23 28 macx { 24 29 # Duplication of source with libmyth (e.g. oldsettings.cpp) -
programs/mythfrontend/statusbox.cpp
1324 1324 // weighted average loads 1325 1325 contentLines[count].append(". " + QObject::tr("Load") + ": "); 1326 1326 1327 #if def _WIN321327 #if defined(CONFIG_CYGWIN) 1328 1328 contentLines[count].append( 1329 1329 QObject::tr("unknown") + " - getloadavg() " + QObject::tr("failed")); 1330 1330 #else // if !_WIN32 -
programs/mythtranscode/replex/replex.pro
27 27 QMAKE_EXTENSION_SHLIB=so 28 28 } 29 29 30 TARGETDEPS += ../../../libs/libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 31 TARGETDEPS += ../../../libs/libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 32 TARGETDEPS += ../../../libs/libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 30 cygwin { 31 TARGETDEPS += ../../../libs/libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 32 TARGETDEPS += ../../../libs/libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 33 TARGETDEPS += ../../../libs/libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 34 } else { 35 TARGETDEPS += ../../../libs/libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 36 TARGETDEPS += ../../../libs/libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 37 TARGETDEPS += ../../../libs/libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 38 } 33 39 34 40 DEPENDPATH += ../../../libs/libavutil ../../../libs/libavformat ../../../libs/libsavcodec -
programs/mythbackend/mainserver.cpp
2111 2111 2112 2112 QStringList strlist; 2113 2113 2114 #if !defined(CONFIG_CYGWIN) 2114 2115 double loads[3]; 2115 2116 if (getloadavg(loads,3) == -1) 2116 2117 strlist << "getloadavg() failed"; … … 2118 2119 strlist << QString::number(loads[0]) 2119 2120 << QString::number(loads[1]) 2120 2121 << QString::number(loads[2]); 2122 #else 2123 strlist << "getloadavg() not supported"; 2124 #endif 2121 2125 2122 2126 SendResponse(pbssock, strlist); 2123 2127 } -
programs/mythbackend/httpstatus.cpp
357 357 358 358 storage.setAttribute("fsids", ids); 359 359 360 #if !defined(CONFIG_CYGWIN) 360 361 // load average --------------------- 361 362 362 363 double rgdAverages[3]; … … 367 368 load.setAttribute("avg2", rgdAverages[1]); 368 369 load.setAttribute("avg3", rgdAverages[2]); 369 370 } 370 371 #endif 371 372 372 373 //temperature ----------------- 373 374 // Try ACPI first, then lmsensor 2nd -
programs/mythbackend/backendutil.cpp
4 4 #if defined(CONFIG_DARWIN) || defined(__FreeBSD__) 5 5 #include <sys/param.h> 6 6 #include <sys/mount.h> 7 #elif __linux__ 7 #elif __linux__ || defined(CONFIG_CYGWIN) 8 8 #include <sys/vfs.h> 9 9 #endif 10 10 -
filters/postprocess/postprocess.pro
4 4 INCLUDEPATH += ../../libs/libmythtv 5 5 DEPENDPATH += ../../libs/libmythtv 6 6 7 SOURCES += filter_postprocess.c 7 SOURCES += filter_postprocess.c ../../libs/libavcodec/libpostproc/postprocess.c 8 8 9 9 # Lots of symbols like pp_free_context, pp_free_mode, pp_get_context, pp_help 10 10 # are used but not defined, which sometimes prevents linking on OS X. -
filters/filter-avcodec.pro
13 13 isEmpty(QMAKE_EXTENSION_SHLIB) { 14 14 QMAKE_EXTENSION_SHLIB=so 15 15 } 16 cygwin { 17 QMAKE_EXTENSION_SHLIB=$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN} 18 } 16 19 TARGETDEPS += ../../libs/libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} 17 20 TARGETDEPS += ../../libs/libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}