Skip to content
This repository
Browse code

changed, split libamplayer includes into amcodec and amplayer to make…

… sync with upstream easier
  • Loading branch information...
commit a43466346b01e87e08bcc77f6769b6b8ec9295ec 1 parent 9cdba48
authored August 22, 2013

Showing 22 changed files with 13 additions and 9 deletions. Show diff stats Hide diff stats

  1. 4  configure.in
  2. 6  tools/depends/target/libamplayer/Makefile
  3. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/amports/aformat.h
  4. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/amports/amstream.h
  5. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/amports/vformat.h
  6. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/codec.h
  7. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/codec_error.h
  8. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/codec_msg.h
  9. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/codec_type.h
  10. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/log_print.h
  11. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/message.h
  12. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player.h
  13. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_error.h
  14. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_id.h
  15. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_set_sys.h
  16. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_thumbnail.h
  17. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_type.h
  18. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/stream_format.h
  19. 4  xbmc/cores/amlplayer/DllLibamplayer.h
  20. 3  xbmc/cores/amlplayer/Makefile.in
  21. 2  xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
  22. 3  xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
4  configure.in
@@ -1827,7 +1827,7 @@ AC_DEFINE(YAJL_MAJOR, 1, [yajl version 1])
1827 1827
 # additional internal players
1828 1828
 case $add_players in
1829 1829
   *amlplayer*)
1830  
-      AC_CHECK_HEADER([amlplayer/amports/amstream.h],, AC_MSG_ERROR($missing_headers))
  1830
+      AC_CHECK_HEADER([amplayer/player_error.h],, AC_MSG_ERROR($missing_headers))
1831 1831
       XB_ADD_PLAYER([AMLPLAYER], [amlplayer])
1832 1832
       ;;
1833 1833
   *omxplayer*)
@@ -1838,7 +1838,7 @@ esac
1838 1838
 # additional internal codecs
1839 1839
 case $add_codecs in
1840 1840
   *amcodec*)
1841  
-      AC_CHECK_HEADER([amlplayer/codec_error.h],, AC_MSG_ERROR($missing_headers))
  1841
+      AC_CHECK_HEADER([amcodec/codec_error.h],, AC_MSG_ERROR($missing_headers))
1842 1842
       XB_ADD_CODEC([LIBAMCODEC], [amcodec])
1843 1843
       ;;
1844 1844
   *libstagefright*)
6  tools/depends/target/libamplayer/Makefile
@@ -4,8 +4,10 @@ DEPS= ../../Makefile.include Makefile
4 4
 all: .installed-$(PLATFORM)
5 5
 
6 6
 .installed-$(PLATFORM): $(DEPS)
7  
-	mkdir -p $(PREFIX)/include/amlplayer
8  
-	cp -rf libamplayer/include/* $(PREFIX)/include/amlplayer
  7
+	mkdir -p $(PREFIX)/include/amcodec
  8
+	cp -rf libamplayer/include/amcodec/* $(PREFIX)/include/amcodec/
  9
+	mkdir -p $(PREFIX)/include/amplayer
  10
+	cp -rf libamplayer/include/amplayer/* $(PREFIX)/include/amplayer/
9 11
 	touch $@
10 12
 
11 13
 clean:
0  ...libamplayer/libamplayer/include/amports/aformat.h → ...yer/libamplayer/include/amcodec/amports/aformat.h
File renamed without changes
0  ...ibamplayer/libamplayer/include/amports/amstream.h → ...er/libamplayer/include/amcodec/amports/amstream.h
File renamed without changes
0  ...libamplayer/libamplayer/include/amports/vformat.h → ...yer/libamplayer/include/amcodec/amports/vformat.h
File renamed without changes
0  ...ds/target/libamplayer/libamplayer/include/codec.h → ...t/libamplayer/libamplayer/include/amcodec/codec.h
File renamed without changes
0  ...get/libamplayer/libamplayer/include/codec_error.h → ...mplayer/libamplayer/include/amcodec/codec_error.h
File renamed without changes
0  ...arget/libamplayer/libamplayer/include/codec_msg.h → ...bamplayer/libamplayer/include/amcodec/codec_msg.h
File renamed without changes
0  ...rget/libamplayer/libamplayer/include/codec_type.h → ...amplayer/libamplayer/include/amcodec/codec_type.h
File renamed without changes
0  ...arget/libamplayer/libamplayer/include/log_print.h → ...amplayer/libamplayer/include/amplayer/log_print.h
File renamed without changes
0  .../target/libamplayer/libamplayer/include/message.h → ...ibamplayer/libamplayer/include/amplayer/message.h
File renamed without changes
0  ...s/target/libamplayer/libamplayer/include/player.h → ...libamplayer/libamplayer/include/amplayer/player.h
File renamed without changes
0  ...et/libamplayer/libamplayer/include/player_error.h → ...layer/libamplayer/include/amplayer/player_error.h
File renamed without changes
0  ...arget/libamplayer/libamplayer/include/player_id.h → ...amplayer/libamplayer/include/amplayer/player_id.h
File renamed without changes
0  .../libamplayer/libamplayer/include/player_set_sys.h → ...yer/libamplayer/include/amplayer/player_set_sys.h
File renamed without changes
0  ...ibamplayer/libamplayer/include/player_thumbnail.h → ...r/libamplayer/include/amplayer/player_thumbnail.h
File renamed without changes
0  ...get/libamplayer/libamplayer/include/player_type.h → ...player/libamplayer/include/amplayer/player_type.h
File renamed without changes
0  ...t/libamplayer/libamplayer/include/stream_format.h → ...ayer/libamplayer/include/amplayer/stream_format.h
File renamed without changes
4  xbmc/cores/amlplayer/DllLibamplayer.h
@@ -36,8 +36,8 @@ extern "C"
36 36
   #define HAS_AMLPLAYER_VIDEO_STREAMS10
37 37
 #endif
38 38
 
39  
-#include <player_type.h>
40  
-#include <player_error.h>
  39
+#include <amplayer/player_type.h>
  40
+#include <amplayer/player_error.h>
41 41
 }
42 42
 
43 43
 struct AML_URLProtocol;
3  xbmc/cores/amlplayer/Makefile.in
... ...
@@ -1,6 +1,7 @@
1 1
 .PHONY: compile
2 2
 
3  
-INCLUDES += -I$(prefix)/include/amlplayer
  3
+INCLUDES += -I$(prefix)/include/amcodec
  4
+INCLUDES += -I$(prefix)/include/amplayer
4 5
 
5 6
 SRCS = AMLPlayer.cpp
6 7
 SRCS+= FileURLProtocol.cpp
2  xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
@@ -44,7 +44,7 @@
44 44
 
45 45
 // amcodec include
46 46
 extern "C" {
47  
-#include <codec.h>
  47
+#include <amcodec/codec.h>
48 48
 }  // extern "C"
49 49
 
50 50
 class DllLibamCodecInterface
3  xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
@@ -37,7 +37,8 @@ endif
37 37
 ifeq (@USE_LIBAMCODEC@,1)
38 38
 SRCS += AMLCodec.cpp
39 39
 SRCS += DVDVideoCodecAmlogic.cpp
40  
-INCLUDES += -I$(prefix)/include/amlplayer
  40
+INCLUDES += -I$(prefix)/include/amcodec
  41
+INCLUDES += -I$(prefix)/include/amplayer
41 42
 endif
42 43
 
43 44
 LIB=Video.a

0 notes on commit a434663

Please sign in to comment.
Something went wrong with that request. Please try again.