summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2011-04-08 03:05:34 +0100
committerBastien Nocera <hadess@hadess.net>2011-04-08 03:05:34 +0100
commit699af2d7ae0c2fb19109a0b5ffd10dac645de7e2 (patch)
treee7400cd0b37450421140c60ae7da47debcc9fd5f
parentbda0c0afb3500f5648b3f9ee0dab3511927fb221 (diff)
downloadgvfs-699af2d7ae0c2fb19109a0b5ffd10dac645de7e2.tar.gz
common: Remove unneeded copied header file
Turns out the header is properly shipped by libluray.
-rw-r--r--common/Makefile.am1
-rw-r--r--common/gvfsmountinfo.c2
-rw-r--r--common/meta_data.h55
3 files changed, 1 insertions, 57 deletions
diff --git a/common/Makefile.am b/common/Makefile.am
index 0d0dbc61..fefd441a 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -19,7 +19,6 @@ libgvfscommon_la_SOURCES = \
gvfsicon.h gvfsicon.c \
gvfsmountinfo.h gvfsmountinfo.c \
gvfsfileinfo.c gvfsfileinfo.h \
- meta_data.h \
$(NULL)
# needed by cygwin (see bug #564003)
diff --git a/common/gvfsmountinfo.c b/common/gvfsmountinfo.c
index a9bc1212..c49b0554 100644
--- a/common/gvfsmountinfo.c
+++ b/common/gvfsmountinfo.c
@@ -28,7 +28,7 @@
#ifdef HAVE_BLURAY
#include <langinfo.h>
#include <libbluray/bluray.h>
-#include "meta_data.h"
+#include <libbluray/meta_data.h>
#endif /* HAVE_BLURAY */
#include "gvfsmountinfo.h"
diff --git a/common/meta_data.h b/common/meta_data.h
deleted file mode 100644
index 0a2c0b33..00000000
--- a/common/meta_data.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * This file is part of libbluray
- * Copyright (C) 2010 fraxinas
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#if !defined(_META_DATA_H_)
-#define _META_DATA_H_
-
-#include <stdint.h>
-
-typedef struct meta_thumbnail {
- char * path;
- uint32_t xres;
- uint32_t yres;
-} META_THUMBNAIL;
-
-typedef struct meta_title {
- uint32_t title_number;
- char * title_name;
-} META_TITLE;
-
-typedef struct meta_dl {
- char language_code[4];
- char * filename;
- char * di_name;
- char * di_alternative;
- uint8_t di_num_sets;
- uint8_t di_set_number;
- uint32_t toc_count;
- META_TITLE * toc_entries;
- uint8_t thumb_count;
- META_THUMBNAIL * thumbnails;
-} META_DL;
-
-typedef struct meta_root {
- uint8_t dl_count;
- META_DL * dl_entries;
-} META_ROOT;
-
-#endif // _META_DATA_H_
-