libbluray | branch: master | hpi1 <[email protected]> | Fri Oct 17 19:46:11 2014 +0300| [2549f9292078e65db2213d4e4e29b195fa10717d] | committer: hpi1
examples: fix includes > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=2549f9292078e65db2213d4e4e29b195fa10717d --- src/examples/bd_info.c | 10 +++------- src/examples/bdsplice.c | 7 +++---- src/examples/clpi_dump.c | 2 -- src/examples/hdmv_test.c | 6 +++--- src/examples/index_dump.c | 4 ++-- src/examples/libbluray_test.c | 8 ++------ src/examples/list_titles.c | 6 +----- src/examples/mobj_dump.c | 2 +- src/examples/sound_dump.c | 4 ++-- 9 files changed, 17 insertions(+), 32 deletions(-) diff --git a/src/examples/bd_info.c b/src/examples/bd_info.c index aefdadc..0eb564d 100644 --- a/src/examples/bd_info.c +++ b/src/examples/bd_info.c @@ -17,18 +17,14 @@ * <http://www.gnu.org/licenses/>. */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "libbluray/bdnav/meta_data.h" -#include "libbluray/bluray.h" - #include <stdio.h> #include <stdlib.h> #include <inttypes.h> #include <unistd.h> +#include "libbluray/bdnav/meta_data.h" +#include "libbluray/bluray.h" + static const char *_yes_no(int i) { return i > 0 ? "yes" : i < 0 ? "unknown" : "no"; diff --git a/src/examples/bdsplice.c b/src/examples/bdsplice.c index 4375d9e0..c436fab 100644 --- a/src/examples/bdsplice.c +++ b/src/examples/bdsplice.c @@ -21,15 +21,14 @@ #include "config.h" #endif -#include "libbluray/bluray.h" -#include "util/macro.h" -#include "util/strutl.h" - +#include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <libgen.h> #include <inttypes.h> +#include "libbluray/bluray.h" + #define PKT_SIZE 192 #define BUF_SIZE (PKT_SIZE * 1024) #define MIN(a,b) (((a) < (b)) ? a : b) diff --git a/src/examples/clpi_dump.c b/src/examples/clpi_dump.c index e9d994f..bd64783 100644 --- a/src/examples/clpi_dump.c +++ b/src/examples/clpi_dump.c @@ -18,8 +18,6 @@ * <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/src/examples/hdmv_test.c b/src/examples/hdmv_test.c index 9401c3d..585ed70 100644 --- a/src/examples/hdmv_test.c +++ b/src/examples/hdmv_test.c @@ -17,14 +17,14 @@ * <http://www.gnu.org/licenses/>. */ -#include "util/log_control.h" -#include "libbluray/bluray.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> #include <inttypes.h> +#include "util/log_control.h" +#include "libbluray/bluray.h" + static void _print_event(BD_EVENT *ev) { switch (ev->event) { diff --git a/src/examples/index_dump.c b/src/examples/index_dump.c index ddb54ed..f01e608 100644 --- a/src/examples/index_dump.c +++ b/src/examples/index_dump.c @@ -17,10 +17,10 @@ * <http://www.gnu.org/licenses/>. */ -#include "libbluray/bluray.h" - #include <stdio.h> +#include "libbluray/bluray.h" + static void _indx_print_title(const BLURAY_TITLE *title, int normal_title) { printf(" object type : %s\n", title->bdj ? "BD-J" : "HDMV"); diff --git a/src/examples/libbluray_test.c b/src/examples/libbluray_test.c index 83642d7..d4934a1 100644 --- a/src/examples/libbluray_test.c +++ b/src/examples/libbluray_test.c @@ -18,17 +18,13 @@ * <http://www.gnu.org/licenses/>. */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include "libbluray/bluray.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> #include <inttypes.h> +#include "libbluray/bluray.h" + int main(int argc, char *argv[]) { BLURAY *bd; diff --git a/src/examples/list_titles.c b/src/examples/list_titles.c index 0d4f1fa..2e0cae8 100644 --- a/src/examples/list_titles.c +++ b/src/examples/list_titles.c @@ -17,10 +17,6 @@ * <http://www.gnu.org/licenses/>. */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include "libbluray/bluray.h" #include <stdio.h> @@ -32,7 +28,7 @@ static void _usage(char *cmd) { - fprintf(stderr, + fprintf(stderr, "%s <BD base dir> [-s <seconds>]\n" " List the titles and title info of a BD\n" " -s # - Filter out titles shorter than # seconds\n" diff --git a/src/examples/mobj_dump.c b/src/examples/mobj_dump.c index 9ae05cd..8436c2f 100644 --- a/src/examples/mobj_dump.c +++ b/src/examples/mobj_dump.c @@ -17,9 +17,9 @@ * <http://www.gnu.org/licenses/>. */ -#include "util/macro.h" #include "libbluray/hdmv/mobj_parse.h" +#include <stdio.h> #include <string.h> static void _mobj_print(MOBJ_OBJECTS *objects, int disasm) diff --git a/src/examples/sound_dump.c b/src/examples/sound_dump.c index e0d0bdf..a44e65b 100644 --- a/src/examples/sound_dump.c +++ b/src/examples/sound_dump.c @@ -17,11 +17,11 @@ * <http://www.gnu.org/licenses/>. */ -#include "libbluray/bluray.h" - #include <stdio.h> #include <stdlib.h> +#include "libbluray/bluray.h" + static void _sound_print(int sound_index, BLURAY_SOUND_EFFECT *data) { _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
