[MPlayer-cvslog] CVS: main/libmpdvdkit2 libdvdread_changes.diff, 1.10, 1.11
Diego Biurrun CVS
syncmail at mplayerhq.hu
Mon May 1 14:29:08 CEST 2006
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main/libmpdvdkit2
In directory mail:/var2/tmp/cvs-serv29633/libmpdvdkit2
Modified Files:
libdvdread_changes.diff
Log Message:
misc wording/spelling fixes
Index: libdvdread_changes.diff
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/libdvdread_changes.diff,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libdvdread_changes.diff 9 Mar 2006 17:39:34 -0000 1.10
+++ libdvdread_changes.diff 1 May 2006 12:29:05 -0000 1.11
@@ -1,25 +1,16 @@
diff -Naur dvdread.orig/bswap.h dvdread/bswap.h
--- dvdread.orig/bswap.h 2005-06-23 00:18:54.000000000 +0200
+++ dvdread/bswap.h 2005-06-23 00:19:10.000000000 +0200
-@@ -20,8 +20,6 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+@@ -59,15 +57,53 @@
+ #define B2N_32(x) x = be32toh(x)
+ #define B2N_64(x) x = be64toh(x)
--#include <config.h>
--
- #if defined(WORDS_BIGENDIAN)
- /* All bigendian systems are fine, just ignore the swaps. */
- #define B2N_16(x) (void)(x)
-@@ -59,13 +57,57 @@
+ #elif defined(__DragonFly__)
+ #include <sys/endian.h>
+ #define B2N_16(x) x = be16toh(x)
#define B2N_32(x) x = be32toh(x)
#define B2N_64(x) x = be64toh(x)
-+#elif defined(__DragonFly__)
-+#include <sys/endian.h>
-+#define B2N_16(x) x = be16toh(x)
-+#define B2N_32(x) x = be32toh(x)
-+#define B2N_64(x) x = be64toh(x)
-+
+#elif defined(ARCH_X86)
+inline static unsigned short bswap_16(unsigned short x)
+{
@@ -63,12 +54,6 @@
* Old FreeBSD's and Solaris don't have <byteswap.h> or any other such
* functionality!
*/
-
--#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__)
-+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__CYGWIN__)
- #define B2N_16(x) \
- x = ((((x) & 0xff00) >> 8) | \
- (((x) & 0x00ff) << 8))
diff -Naur dvdread.orig/.cvsignore dvdread/.cvsignore
diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c
--- dvdread.orig/dvd_input.c 2005-06-23 00:18:54.000000000 +0200
@@ -115,7 +100,7 @@
diff -Naur dvdread.orig/dvd_reader.c dvdread/dvd_reader.c
--- dvdread.orig/dvd_reader.c 2005-06-23 00:18:54.000000000 +0200
+++ dvdread/dvd_reader.c 2005-06-23 00:19:10.000000000 +0200
-@@ -32,24 +32,36 @@
+@@ -32,35 +32,37 @@
#include <limits.h>
#include <dirent.h>
@@ -135,16 +120,17 @@
#include <mntent.h>
#endif
-+#ifdef __MINGW32__
-+#include <sys/timeb.h>
-+static void gettimeofday(struct timeval* t,void* timezone){
-+ struct timeb timebuffer;
-+ ftime( &timebuffer );
-+ t->tv_sec=timebuffer.time;
-+ t->tv_usec=1000*timebuffer.millitm;
-+}
-+#endif
-+
+ #ifdef __MINGW32__
+ #include <sys/timeb.h>
+ static int gettimeofday(struct timeval* t,void* timezone){
+ struct timeb t;
+ ftime( &t );
+ t->tv_sec=t.time;
+ t->tv_usec=t.millitm*1000;
+ return 0;
+ }
+ #endif
+
#include "dvd_udf.h"
#include "dvd_input.h"
#include "dvd_reader.h"
@@ -180,13 +166,6 @@
+#else
{
char *new_path;
-
- /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */
-- if( !strncmp( path, "/dev/", 5 ) || strncmp( path, "/dev/r", 6 ) )
-+ if( strncmp( path, "/dev/", 5 ) || !strncmp( path, "/dev/r", 6 ) )
- return (char *) strdup( path );
-
- /* Replace "/dev/" with "/dev/r" */
@@ -292,6 +316,7 @@
return new_path;
@@ -195,31 +174,6 @@
#endif
dvd_reader_t *DVDOpen( const char *path )
-@@ -303,6 +328,16 @@
- if( path == NULL )
- return 0;
-
-+#ifdef WIN32
-+ /* Stat doesn't work on devices under mingwin/cygwin. */
-+ if( path[0] && path[1] == ':' && path[2] == '\0' )
-+ {
-+ /* Don't try to stat the file */
-+ fileinfo.st_mode = S_IFBLK;
-+ }
-+ else
-+#endif
-+ {
- ret = stat( path, &fileinfo );
- if( ret < 0 ) {
- /* If we can't stat the file, give up */
-@@ -310,6 +345,7 @@
- perror("");
- return 0;
- }
-+ }
-
- /* Try to open libdvdcss or fall back to standard functions */
- have_css = dvdinput_setup();
@@ -335,7 +371,7 @@
char *path_copy;
#if defined(SYS_BSD)
@@ -269,15 +223,6 @@
}
/*
if( dvdinput_title( dvd_file->dvd->dev, (int)start ) < 0 ) {
-@@ -915,7 +956,7 @@
- return (ssize_t)ret;
- }
-
--int32_t DVDFileSeek( dvd_file_t *dvd_file, int32_t offset )
-+int DVDFileSeek( dvd_file_t *dvd_file, int offset )
- {
- /* Check arguments. */
- if( dvd_file == NULL || offset < 0 )
diff -Naur dvdread.orig/dvdread_internal.h dvdread/dvdread_internal.h
--- dvdread.orig/dvdread_internal.h 2005-06-23 00:18:54.000000000 +0200
+++ dvdread/dvdread_internal.h 2005-06-23 00:19:10.000000000 +0200
@@ -329,20 +274,6 @@
i, pgc->subp_control[i]);
}
-diff -Naur dvdread.orig/ifo_print.h dvdread/ifo_print.h
---- dvdread/ifo_print.h 2002-08-15 22:13:21.000000000 +0200
-+++ /home/diego/src/mplayer/vanilla/libmpdvdkit2/ifo_print.h 2005-12-29 13:13:21.000000000 +0100
-@@ -20,8 +20,8 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <dvdread/ifo_types.h>
--#include <dvdread/dvd_reader.h>
-+#include "ifo_types.h"
-+#include "dvd_reader.h"
-
- #ifdef __cplusplus
- extern "C" {
diff -Naur dvdread.orig/ifo_read.c dvdread/ifo_read.c
--- dvdread.orig/ifo_read.c 30 Jun 2005 22:48:26 -0000 1.4
+++ dvdread/ifo_read.c 3 Oct 2005 14:29:01 -0000 1.5
@@ -371,32 +302,9 @@
/* Check that time is 0:0:0:0 also if nr_of_programs == 0 */
-diff -Naur dvdread.orig/ifo_read.h dvdread/ifo_read.h
---- dvdread.orig/ifo_read.h 2005-06-23 00:18:54.000000000 +0200
-+++ dvdread/ifo_read.h 2005-06-23 00:19:10.000000000 +0200
-@@ -20,8 +20,8 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <dvdread/ifo_types.h>
--#include <dvdread/dvd_reader.h>
-+#include "ifo_types.h"
-+#include "dvd_reader.h"
-
- #ifdef __cplusplus
- extern "C" {
diff -Naur dvdread.orig/ifo_types.h dvdread/ifo_types.h
--- dvdread.orig/ifo_types.h 2005-06-23 00:18:54.000000000 +0200
+++ dvdread/ifo_types.h 2005-06-23 00:19:10.000000000 +0200
-@@ -21,7 +21,7 @@
- */
-
- #include <inttypes.h>
--#include <dvdread/dvd_reader.h>
-+#include "dvd_reader.h"
-
-
- #undef ATTRIBUTE_PACKED
@@ -394,6 +394,55 @@
} ATTRIBUTE_PACKED user_ops_t;
@@ -464,41 +372,3 @@
uint16_t next_pgc_nr;
uint16_t prev_pgc_nr;
uint16_t goup_pgc_nr;
-diff -Naur dvdread.orig/nav_print.c dvdread/nav_print.c
-diff -Naur dvdread.orig/nav_print.h dvdread/nav_print.h
---- dvdread.orig/nav_print.h 2005-06-23 00:18:54.000000000 +0200
-+++ dvdread/nav_print.h 2005-06-23 00:19:10.000000000 +0200
-@@ -20,7 +20,7 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <dvdread/nav_types.h>
-+#include "nav_types.h"
-
- /**
- * Pretty printing of the NAV packets, PCI and DSI structs.
-diff -Naur dvdread.orig/nav_read.c dvdread/nav_read.c
-diff -Naur dvdread.orig/nav_read.h dvdread/nav_read.h
---- dvdread.orig/nav_read.h 2005-06-23 00:18:54.000000000 +0200
-+++ dvdread/nav_read.h 2005-06-23 00:19:10.000000000 +0200
-@@ -19,7 +19,7 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include <dvdread/nav_types.h>
-+#include "nav_types.h"
-
- /**
- * Parsing of NAV data, PCI and DSI parts.
-diff -Naur dvdread.orig/nav_types.h dvdread/nav_types.h
---- dvdread.orig/nav_types.h 2005-06-23 00:18:54.000000000 +0200
-+++ dvdread/nav_types.h 2005-06-23 00:19:10.000000000 +0200
-@@ -30,7 +30,7 @@
- */
-
- #include <inttypes.h>
--#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
-+#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */
-
-
- #undef ATTRIBUTE_PACKED
More information about the MPlayer-cvslog
mailing list