libbluray | branch: master | hpi1 <[email protected]> | Tue Jan 27 13:33:37 2015 +0200| [5d64e5caada60050da08f3195802b85582bbc907] | committer: hpi1
Move files > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=5d64e5caada60050da08f3195802b85582bbc907 --- src/Makefile.am | 8 ++++---- src/libbluray/bluray.c | 5 ++--- src/{file/libaacs.c => libbluray/disc/aacs.c} | 9 ++++----- src/{file/libaacs.h => libbluray/disc/aacs.h} | 0 src/{file/libbdplus.c => libbluray/disc/bdplus.c} | 9 ++++----- src/{file/libbdplus.h => libbluray/disc/bdplus.h} | 0 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 57a87e4..74e3070 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,6 +61,10 @@ libbluray_la_SOURCES = \ libbluray/decoders/graphics_processor.c \ libbluray/decoders/graphics_controller.h \ libbluray/decoders/graphics_controller.c \ + libbluray/disc/aacs.h \ + libbluray/disc/aacs.c \ + libbluray/disc/bdplus.h \ + libbluray/disc/bdplus.c \ libbluray/disc/disc.h \ libbluray/disc/disc.c \ libbluray/hdmv/hdmv_insn.h \ @@ -78,10 +82,6 @@ libbluray_la_SOURCES = \ file/mount.h \ file/filesystem.h \ file/filesystem.c \ - file/libaacs.h \ - file/libaacs.c \ - file/libbdplus.h \ - file/libbdplus.c \ util/array.h \ util/array.c \ util/attributes.h \ diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c index 309b0d8..71e870d 100644 --- a/src/libbluray/bluray.c +++ b/src/libbluray/bluray.c @@ -44,6 +44,8 @@ #include "decoders/graphics_controller.h" #include "decoders/m2ts_filter.h" #include "decoders/overlay.h" +#include "disc/aacs.h" +#include "disc/bdplus.h" #include "disc/disc.h" #include "file/file.h" #ifdef USING_BDJAVA @@ -51,9 +53,6 @@ #include "bdj/bdjo_parse.h" #endif -#include "file/libaacs.h" -#include "file/libbdplus.h" - #include <stdio.h> // SEEK_ #include <stdlib.h> #include <inttypes.h> diff --git a/src/file/libaacs.c b/src/libbluray/disc/aacs.c similarity index 99% rename from src/file/libaacs.c rename to src/libbluray/disc/aacs.c index 034190f..d88dd57 100644 --- a/src/file/libaacs.c +++ b/src/libbluray/disc/aacs.c @@ -17,13 +17,12 @@ * <http://www.gnu.org/licenses/>. */ -#include "libaacs.h" +#include "aacs.h" -#include "dl.h" -#include "file.h" - -#include "disc/disc.h" +#include "disc.h" +#include "file/dl.h" +#include "file/file.h" #include "util/logging.h" #include "util/macro.h" #include "util/strutl.h" diff --git a/src/file/libaacs.h b/src/libbluray/disc/aacs.h similarity index 100% rename from src/file/libaacs.h rename to src/libbluray/disc/aacs.h diff --git a/src/file/libbdplus.c b/src/libbluray/disc/bdplus.c similarity index 98% rename from src/file/libbdplus.c rename to src/libbluray/disc/bdplus.c index 0b4a797..1150397 100644 --- a/src/file/libbdplus.c +++ b/src/libbluray/disc/bdplus.c @@ -17,13 +17,12 @@ * <http://www.gnu.org/licenses/>. */ -#include "libbdplus.h" +#include "bdplus.h" -#include "dl.h" -#include "file.h" - -#include "disc/disc.h" +#include "disc.h" +#include "file/dl.h" +#include "file/file.h" #include "util/logging.h" #include "util/macro.h" #include "util/strutl.h" diff --git a/src/file/libbdplus.h b/src/libbluray/disc/bdplus.h similarity index 100% rename from src/file/libbdplus.h rename to src/libbluray/disc/bdplus.h _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
