Ticket #6533: r20511_win32.patch
File r20511_win32.patch, 5.9 KB (added by , 15 years ago) |
---|
-
libs/libmythdvdnav/dvdnav/dvdnav.h
41 41 #include <dvdread/ifo_types.h> /* For vm_cmd_t */ 42 42 #include <dvdnav/dvdnav_events.h> 43 43 44 #include "compat.h" 44 45 45 46 46 47 /********************************************************************* -
libs/libmythdvdnav/dvdread/dvd_input.c
54 54 #include <dlfcn.h> 55 55 #else 56 56 /* Only needed on MINGW at the moment */ 57 #include " ../../msvc/contrib/dlfcn.c"57 #include "compat.h" 58 58 #endif 59 59 60 60 typedef struct dvdcss_s *dvdcss_handle; -
libs/libmythdvdnav/libmythdvdnav.pro
9 9 10 10 INCLUDEPATH += ../../ 11 11 INCLUDEPATH += ./dvdnav 12 INCLUDEPATH += ../libmythdb 12 13 13 14 14 15 #build position independent code since the library is linked into a shared library -
libs/libmythtv/util-opengl.h
82 82 #define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD 83 83 #endif 84 84 85 #ifndef GL_MAX_TEXTURE_UNITS 86 #define GL_MAX_TEXTURE_UNITS 0x84E2 87 #endif 88 85 89 #ifndef GL_PIXEL_UNPACK_BUFFER_ARB 86 90 #define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC 87 91 #endif -
libs/libmythtv/channelscan/channelscan_sm.h
30 30 #ifndef SISCAN_H 31 31 #define SISCAN_H 32 32 33 // POSIX includes 34 #include <pthread.h> 35 33 36 // Qt includes 34 37 #include <qobject.h> 35 38 #include <qstring.h> -
filters/kerneldeint/filter_kerneldeint.c
40 40 { 41 41 int ready; 42 42 pthread_t id; 43 int exists; 43 44 }; 44 45 45 46 typedef struct ThisFilter … … 525 526 { 526 527 filter->kill_threads = 1; 527 528 for (i = 0; i < filter->requested_threads; i++) 528 if (filter->threads[i]. id != 0)529 if (filter->threads[i].exists) 529 530 pthread_join(filter->threads[i].id, NULL); 530 531 free(filter->threads); 531 532 } … … 615 616 { 616 617 if (pthread_create(&(filter->threads[i].id), NULL, 617 618 KernelThread, (void*)filter) != 0) 618 filter->threads[i]. id= 0;619 filter->threads[i].exists = 0; 619 620 else 621 { 620 622 success++; 623 filter->threads[i].exists = 1; 624 } 621 625 } 622 626 623 627 if (success < filter->requested_threads) … … 675 679 }, 676 680 FILT_NULL 677 681 }; 682 /* vim: set expandtab tabstop=4 shiftwidth=4: */ -
filters/kerneldeint/kerneldeint.pro
7 7 LIBS += -lmythdb-$${LIBVERSION} -L../../libs/libmythdb 8 8 macx:LIBS += -lmythui-$${LIBVERSION} -L../../libs/libmythui 9 9 macx:LIBS += -lmythupnp-$${LIBVERSION} -L../../libs/libmythupnp 10 mingw:LIBS += -lpthread 10 11 11 12 # Input 12 13 SOURCES += filter_kerneldeint.c -
filters/yadif/filter_yadif.c
56 56 { 57 57 int ready; 58 58 pthread_t id; 59 int exists; 59 60 }; 60 61 61 62 typedef struct ThisFilter … … 545 546 { 546 547 f->kill_threads = 1; 547 548 for (i = 0; i < f->requested_threads; i++) 548 if (f->threads[i]. id != 0)549 if (f->threads[i].exists) 549 550 pthread_join(f->threads[i].id, NULL); 550 551 free(f->threads); 551 552 } … … 671 672 { 672 673 if (pthread_create(&(filter->threads[i].id), NULL, 673 674 YadifThread, (void*)filter) != 0) 674 filter->threads[i]. id= 0;675 filter->threads[i].exists = 0; 675 676 else 677 { 676 678 success++; 679 filter->threads[i].exists = 1; 680 } 677 681 } 678 682 679 683 if (success < filter->requested_threads) -
filters/yadif/yadif.pro
3 3 4 4 INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../.. 5 5 6 mingw:LIBS += -lpthread 7 6 8 # Input 7 9 SOURCES += filter_yadif.c 8 10 -
programs/mythjobqueue/main.cpp
2 2 #include <sys/types.h> 3 3 #include <sys/stat.h> 4 4 #include <fcntl.h> 5 #include <signal.h> 5 6 6 7 #include <iostream> 7 8 #include <fstream> -
libs/libmyth/util.cpp
1360 1360 1361 1361 bool IsPulseAudioRunning(void) 1362 1362 { 1363 #ifdef USING_MINGW 1364 return false; 1365 #endif 1363 1366 #if defined(CONFIG_DARWIN) || (__FreeBSD__) || defined(__OpenBSD__) 1364 1367 const char *command = "ps -ax | grep -i pulseaudio | grep -v grep > /dev/null"; 1365 1368 #else