libbluray | branch: master | hpi1 <[email protected]> | Tue Dec 2 13:21:28 2014 +0200| [f2b99cf268c9ab9dfbae093956a250b6bc03ba74] | committer: hpi1
Add mobj_print.h > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=f2b99cf268c9ab9dfbae093956a250b6bc03ba74 --- src/Makefile.am | 1 + src/examples/mobj_dump.c | 3 ++- src/libbluray/hdmv/hdmv_vm.c | 3 ++- src/libbluray/hdmv/mobj_parse.h | 2 -- src/libbluray/hdmv/mobj_print.c | 3 ++- src/libbluray/hdmv/mobj_print.h | 29 +++++++++++++++++++++++++++++ 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index fd18f07..bbdfd72 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -70,6 +70,7 @@ libbluray_la_SOURCES = \ libbluray/hdmv/mobj_data.h \ libbluray/hdmv/mobj_parse.h \ libbluray/hdmv/mobj_parse.c \ + libbluray/hdmv/mobj_print.h \ libbluray/hdmv/mobj_print.c \ file/file.h \ file/file.c \ diff --git a/src/examples/mobj_dump.c b/src/examples/mobj_dump.c index 38837d5..613b261 100644 --- a/src/examples/mobj_dump.c +++ b/src/examples/mobj_dump.c @@ -17,8 +17,9 @@ * <http://www.gnu.org/licenses/>. */ -#include "libbluray/hdmv/mobj_parse.h" #include "libbluray/hdmv/mobj_data.h" +#include "libbluray/hdmv/mobj_parse.h" +#include "libbluray/hdmv/mobj_print.h" #include <stdio.h> #include <string.h> diff --git a/src/libbluray/hdmv/hdmv_vm.c b/src/libbluray/hdmv/hdmv_vm.c index 775edad..020799f 100644 --- a/src/libbluray/hdmv/hdmv_vm.c +++ b/src/libbluray/hdmv/hdmv_vm.c @@ -19,9 +19,10 @@ #include "hdmv_vm.h" -#include "mobj_parse.h" #include "mobj_data.h" #include "hdmv_insn.h" +#include "mobj_parse.h" +#include "mobj_print.h" #include "../register.h" #include "util/macro.h" diff --git a/src/libbluray/hdmv/mobj_parse.h b/src/libbluray/hdmv/mobj_parse.h index a97bbec..43749d8 100644 --- a/src/libbluray/hdmv/mobj_parse.h +++ b/src/libbluray/hdmv/mobj_parse.h @@ -31,6 +31,4 @@ BD_PRIVATE struct mobj_objects* mobj_parse(const char *disc_root) BD_ATTR_MALLOC BD_PRIVATE void mobj_parse_cmd(uint8_t *buf, struct mobj_cmd *cmd); BD_PRIVATE void mobj_free(struct mobj_objects **index); -BD_PRIVATE int mobj_sprint_cmd(char *buf, struct mobj_cmd *cmd); /* print MOBJ_CMD to string. buf is expected to be 256 bytes. */ - #endif // _MOBJ_PARSE_H_ diff --git a/src/libbluray/hdmv/mobj_print.c b/src/libbluray/hdmv/mobj_print.c index d74584c..f6822ba 100644 --- a/src/libbluray/hdmv/mobj_print.c +++ b/src/libbluray/hdmv/mobj_print.c @@ -17,8 +17,9 @@ * <http://www.gnu.org/licenses/>. */ +#include "mobj_print.h" + #include "mobj_data.h" -#include "mobj_parse.h" #include "hdmv_insn.h" #include "util/macro.h" diff --git a/src/libbluray/hdmv/mobj_print.h b/src/libbluray/hdmv/mobj_print.h new file mode 100644 index 0000000..8449ded --- /dev/null +++ b/src/libbluray/hdmv/mobj_print.h @@ -0,0 +1,29 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010 Petri Hintukainen <[email protected]> + * + * 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(_MOBJ_PRINT_H_) +#define _MOBJ_PRINT_H_ + +#include "util/attributes.h" + +struct mobj_cmd; + +BD_PRIVATE int mobj_sprint_cmd(char *buf, struct mobj_cmd *cmd); /* print MOBJ_CMD to string. buf is expected to be 256 bytes. */ + +#endif // _MOBJ_PRINT_H_ _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
