[DVDnav-discuss] r887 - in trunk/libdvdnav: dvdnav-config src/dvdnav.c src/dvdnav.h src/dvdnav_events.h src/dvdnav_internal.h src/highlight.c src/navigation.c src/read_cache.c src/read_cache.h src/remap.c src/searching.c src/settings.c src/vm/decoder.c src/vm/decoder.h src/vm/vm.c src/vm/vm.h src/vm/vmcmd.c src/vm/vmcmd.h
nicodvb
subversion at mplayerhq.hu
Sat Apr 21 01:25:00 CEST 2007
Author: nicodvb
Date: Sat Apr 21 01:24:59 2007
New Revision: 887
Added:
trunk/libdvdnav/dvdnav-config
- copied unchanged from r870, /trunk/libdvdnav/misc/dvdnav-config.in
Modified:
trunk/libdvdnav/src/dvdnav.c
trunk/libdvdnav/src/dvdnav.h
trunk/libdvdnav/src/dvdnav_events.h
trunk/libdvdnav/src/dvdnav_internal.h
trunk/libdvdnav/src/highlight.c
trunk/libdvdnav/src/navigation.c
trunk/libdvdnav/src/read_cache.c
trunk/libdvdnav/src/read_cache.h
trunk/libdvdnav/src/remap.c
trunk/libdvdnav/src/searching.c
trunk/libdvdnav/src/settings.c
trunk/libdvdnav/src/vm/decoder.c
trunk/libdvdnav/src/vm/decoder.h
trunk/libdvdnav/src/vm/vm.c
trunk/libdvdnav/src/vm/vm.h
trunk/libdvdnav/src/vm/vmcmd.c
trunk/libdvdnav/src/vm/vmcmd.h
Log:
moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
Modified: trunk/libdvdnav/src/dvdnav.c
==============================================================================
--- trunk/libdvdnav/src/dvdnav.c (original)
+++ trunk/libdvdnav/src/dvdnav.c Sat Apr 21 01:24:59 2007
@@ -30,6 +30,15 @@
*/
#include <inttypes.h>
+#include "dvd_types.h"
+#include "dvd_reader.h"
+#include "nav_types.h"
+#include "ifo_types.h" /* For vm_cmd_t */
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "dvdnav.h"
+#include "dvdnav_events.h"
#include "dvdnav_internal.h"
#include "read_cache.h"
#include "nav_read.h"
Modified: trunk/libdvdnav/src/dvdnav.h
==============================================================================
--- trunk/libdvdnav/src/dvdnav.h (original)
+++ trunk/libdvdnav/src/dvdnav.h Sat Apr 21 01:24:59 2007
@@ -35,16 +35,11 @@
extern "C" {
#endif
-#ifdef DVDNAV_COMPILE
-# include "dvdnav_events.h"
-# include "dvd_types.h"
-# include "dvd_reader.h"
-# include "ifo_types.h" /* For vm_cmd_t */
-#else
-# include <dvdnav/dvdnav_events.h>
+#ifndef DVDNAV_COMPILE
# include <dvdnav/dvd_types.h>
# include <dvdnav/dvd_reader.h>
# include <dvdnav/ifo_types.h> /* For vm_cmd_t */
+# include <dvdnav/dvdnav_events.h>
#endif
Modified: trunk/libdvdnav/src/dvdnav_events.h
==============================================================================
--- trunk/libdvdnav/src/dvdnav_events.h (original)
+++ trunk/libdvdnav/src/dvdnav_events.h Sat Apr 21 01:24:59 2007
@@ -28,11 +28,6 @@
#ifndef DVDNAV_EVENTS_H_INCLUDED
#define DVDNAV_EVENTS_H_INCLUDED
-#include "ifo_types.h"
-#include "dvd_reader.h"
-#include "nav_types.h"
-
-
/*
* DVDNAV_BLOCK_OK
*
Modified: trunk/libdvdnav/src/dvdnav_internal.h
==============================================================================
--- trunk/libdvdnav/src/dvdnav_internal.h (original)
+++ trunk/libdvdnav/src/dvdnav_internal.h Sat Apr 21 01:24:59 2007
@@ -65,14 +65,6 @@ static inline int _private_gettimeofday(
#endif /* WIN32 */
-/* Uncomment for VM command tracing */
-/* #define TRACE */
-
-#include "decoder.h"
-#include "dvdnav.h"
-#include "vm.h"
-#include "vmcmd.h"
-
/* where should libdvdnav write its messages (stdout/stderr) */
#define MSG_OUT stdout
Modified: trunk/libdvdnav/src/highlight.c
==============================================================================
--- trunk/libdvdnav/src/highlight.c (original)
+++ trunk/libdvdnav/src/highlight.c Sat Apr 21 01:24:59 2007
@@ -28,7 +28,13 @@
#include <assert.h>
#include <inttypes.h>
#include "nav_types.h"
+#include "dvd_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
#include "dvdnav_internal.h"
+#include "dvdnav.h"
/*
#define BUTTON_TESTING
Modified: trunk/libdvdnav/src/navigation.c
==============================================================================
--- trunk/libdvdnav/src/navigation.c (original)
+++ trunk/libdvdnav/src/navigation.c Sat Apr 21 01:24:59 2007
@@ -26,6 +26,14 @@
#endif
#include <inttypes.h>
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
+#include "dvdnav.h"
#include "dvdnav_internal.h"
/* Navigation API calls */
Modified: trunk/libdvdnav/src/read_cache.c
==============================================================================
--- trunk/libdvdnav/src/read_cache.c (original)
+++ trunk/libdvdnav/src/read_cache.c Sat Apr 21 01:24:59 2007
@@ -32,6 +32,13 @@
#endif
#include <inttypes.h>
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
#include "dvdnav.h"
#include "dvdnav_internal.h"
#include "read_cache.h"
Modified: trunk/libdvdnav/src/read_cache.h
==============================================================================
--- trunk/libdvdnav/src/read_cache.h (original)
+++ trunk/libdvdnav/src/read_cache.h Sat Apr 21 01:24:59 2007
@@ -24,8 +24,6 @@
#ifndef __DVDNAV_READ_CACHE_H
#define __DVDNAV_READ_CACHE_H
-#include "dvdnav_internal.h"
-
/* Opaque cache type -- defined in dvdnav_internal.h */
/* typedef struct read_cache_s read_cache_t; */
Modified: trunk/libdvdnav/src/remap.c
==============================================================================
--- trunk/libdvdnav/src/remap.c (original)
+++ trunk/libdvdnav/src/remap.c Sat Apr 21 01:24:59 2007
@@ -32,7 +32,14 @@
#endif /* _MSC_VER */
#include <assert.h>
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
+#include "dvdnav.h"
#include "dvdnav_internal.h"
struct block_s {
Modified: trunk/libdvdnav/src/searching.c
==============================================================================
--- trunk/libdvdnav/src/searching.c (original)
+++ trunk/libdvdnav/src/searching.c Sat Apr 21 01:24:59 2007
@@ -27,6 +27,14 @@
#include <assert.h>
#include <inttypes.h>
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
+#include "dvdnav.h"
#include "dvdnav_internal.h"
/*
Modified: trunk/libdvdnav/src/settings.c
==============================================================================
--- trunk/libdvdnav/src/settings.c (original)
+++ trunk/libdvdnav/src/settings.c Sat Apr 21 01:24:59 2007
@@ -25,6 +25,14 @@
#include "config.h"
#endif
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "remap.h"
+#include "vm/decoder.h"
+#include "vm/vm.h"
+#include "vm/vmcmd.h"
+#include "dvdnav.h"
#include "dvdnav_internal.h"
/* Characteristics/setting API calls */
Modified: trunk/libdvdnav/src/vm/decoder.c
==============================================================================
--- trunk/libdvdnav/src/vm/decoder.c (original)
+++ trunk/libdvdnav/src/vm/decoder.c Sat Apr 21 01:24:59 2007
@@ -31,8 +31,15 @@
#include <stdlib.h>
#include <inttypes.h>
#include <string.h> /* For memset */
+#include "nav_types.h"
#include "ifo_types.h" /* vm_cmd_t */
+#include "dvd_types.h"
+#include "remap.h"
+#include "decoder.h"
+#include "vm.h"
+#include "vmcmd.h"
+#include "dvdnav.h"
#include "dvdnav_internal.h"
uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) {
Modified: trunk/libdvdnav/src/vm/decoder.h
==============================================================================
--- trunk/libdvdnav/src/vm/decoder.h (original)
+++ trunk/libdvdnav/src/vm/decoder.h Sat Apr 21 01:24:59 2007
@@ -28,9 +28,6 @@
#include <inttypes.h>
#include <sys/time.h>
-#include "ifo_types.h" /* vm_cmd_t */
-#include "dvdnav_internal.h"
-
/* link command types */
typedef enum {
LinkNoLink = 0,
Modified: trunk/libdvdnav/src/vm/vm.c
==============================================================================
--- trunk/libdvdnav/src/vm/vm.c (original)
+++ trunk/libdvdnav/src/vm/vm.c Sat Apr 21 01:24:59 2007
@@ -38,9 +38,16 @@
#include <sys/stat.h>
#include <fcntl.h>
+#include "nav_types.h"
#include "ifo_types.h"
#include "ifo_read.h"
+#include "dvd_types.h"
+#include "decoder.h"
+#include "remap.h"
+#include "vm.h"
+#include "vmcmd.h"
+#include "dvdnav.h"
#include "dvdnav_internal.h"
#ifdef _MSC_VER
Modified: trunk/libdvdnav/src/vm/vm.h
==============================================================================
--- trunk/libdvdnav/src/vm/vm.h (original)
+++ trunk/libdvdnav/src/vm/vm.h Sat Apr 21 01:24:59 2007
@@ -26,9 +26,6 @@
#ifndef VM_H_INCLUDED
#define VM_H_INCLUDED
-#include "remap.h"
-#include "dvdnav_internal.h"
-
/* DOMAIN enum */
typedef enum {
@@ -172,6 +169,8 @@ video_attr_t vm_get_video_attr(vm_t *vm)
audio_attr_t vm_get_audio_attr(vm_t *vm, int streamN);
subp_attr_t vm_get_subp_attr(vm_t *vm, int streamN);
+/* Uncomment for VM command tracing */
+/* #define TRACE */
#ifdef TRACE
/* Debug */
void vm_position_print(vm_t *vm, vm_position_t *position);
Modified: trunk/libdvdnav/src/vm/vmcmd.c
==============================================================================
--- trunk/libdvdnav/src/vm/vmcmd.c (original)
+++ trunk/libdvdnav/src/vm/vmcmd.c Sat Apr 21 01:24:59 2007
@@ -31,6 +31,14 @@
#include <ctype.h>
#include <inttypes.h>
+#include "dvd_types.h"
+#include "nav_types.h"
+#include "ifo_types.h"
+#include "decoder.h"
+#include "remap.h"
+#include "vm.h"
+#include "vmcmd.h"
+#include "dvdnav.h"
#include "dvdnav_internal.h"
/* freebsd compatibility */
Modified: trunk/libdvdnav/src/vm/vmcmd.h
==============================================================================
--- trunk/libdvdnav/src/vm/vmcmd.h (original)
+++ trunk/libdvdnav/src/vm/vmcmd.h Sat Apr 21 01:24:59 2007
@@ -25,8 +25,6 @@
#ifndef VMCMD_H_INCLUDED
#define VMCMD_H_INCLUDED
-#include <inttypes.h>
-
void vm_print_mnemonic(vm_cmd_t *command);
void vm_print_cmd(int row, vm_cmd_t *command);
More information about the DVDnav-discuss
mailing list