mirror of
https://github.com/mpv-player/mpv
synced 2024-10-14 11:54:36 +02:00
Remove Windows-only replacement gettimeofday() implementation, both Cygwin
and MinGW have gettimeofday() in recent versions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24115 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
f12a0e61cc
commit
0816147935
@ -189,18 +189,6 @@ void SetAlignHandle(dvd_reader_t *device, void *align)
|
|||||||
dev->align = align;
|
dev->align = align;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WIN32 /* replacement gettimeofday implementation */
|
|
||||||
#include <sys/timeb.h>
|
|
||||||
static int gettimeofday( struct timeval *tv, void *tz )
|
|
||||||
{
|
|
||||||
struct timeb t;
|
|
||||||
ftime( &t );
|
|
||||||
tv->tv_sec = t.time;
|
|
||||||
tv->tv_usec = t.millitm * 1000;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Loop over all titles and call dvdcss_title to crack the keys. */
|
/* Loop over all titles and call dvdcss_title to crack the keys. */
|
||||||
static int initAllCSSKeys( dvd_reader_t *dvd )
|
static int initAllCSSKeys( dvd_reader_t *dvd )
|
||||||
|
@ -22,7 +22,27 @@
|
|||||||
|
|
||||||
struct dvd_reader_s {
|
struct dvd_reader_s {
|
||||||
/* Basic information. */
|
/* Basic information. */
|
||||||
@@ -494,7 +500,7 @@
|
@@ -183,19 +189,7 @@
|
||||||
|
dev->align = align;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#ifdef WIN32 /* replacement gettimeofday implementation */
|
||||||
|
-#include <sys/timeb.h>
|
||||||
|
-static int gettimeofday( struct timeval *tv, void *tz )
|
||||||
|
-{
|
||||||
|
- struct timeb t;
|
||||||
|
- ftime( &t );
|
||||||
|
- tv->tv_sec = t.time;
|
||||||
|
- tv->tv_usec = t.millitm * 1000;
|
||||||
|
- return 0;
|
||||||
|
-}
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
-
|
||||||
|
/* Loop over all titles and call dvdcss_title to crack the keys. */
|
||||||
|
static int initAllCSSKeys( dvd_reader_t *dvd )
|
||||||
|
{
|
||||||
|
@@ -494,7 +488,7 @@
|
||||||
char *path_copy;
|
char *path_copy;
|
||||||
#if defined(SYS_BSD)
|
#if defined(SYS_BSD)
|
||||||
struct fstab* fe;
|
struct fstab* fe;
|
||||||
@ -31,7 +51,7 @@
|
|||||||
FILE *mntfile;
|
FILE *mntfile;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -598,7 +604,7 @@
|
@@ -598,7 +592,7 @@
|
||||||
}
|
}
|
||||||
fclose( mntfile );
|
fclose( mntfile );
|
||||||
}
|
}
|
||||||
@ -40,7 +60,7 @@
|
|||||||
mntfile = fopen( MOUNTED, "r" );
|
mntfile = fopen( MOUNTED, "r" );
|
||||||
if( mntfile ) {
|
if( mntfile ) {
|
||||||
struct mntent *me;
|
struct mntent *me;
|
||||||
@@ -623,6 +629,9 @@
|
@@ -623,6 +617,9 @@
|
||||||
}
|
}
|
||||||
fclose( mntfile );
|
fclose( mntfile );
|
||||||
}
|
}
|
||||||
@ -50,7 +70,7 @@
|
|||||||
#endif
|
#endif
|
||||||
if( !dev_name ) {
|
if( !dev_name ) {
|
||||||
if(verbose >= 1) {
|
if(verbose >= 1) {
|
||||||
@@ -841,8 +850,8 @@
|
@@ -841,8 +838,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if( dvd->css_state == 1 /* Need key init */ ) {
|
if( dvd->css_state == 1 /* Need key init */ ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user