summaryrefslogtreecommitdiffstats
path: root/apps/plugins
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-02-22 21:44:15 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-02-22 21:44:15 +0000
commit652463ecc0085c9e04da17631aa1fdb2703eee80 (patch)
treea05cac6777f599f0e8cabc2306e4f3af69428254 /apps/plugins
parentec6e64ce9011281e6ecbbc0d93b91ce4db2f42dc (diff)
downloadrockbox-652463ecc0085c9e04da17631aa1fdb2703eee80.tar.gz
rockbox-652463ecc0085c9e04da17631aa1fdb2703eee80.tar.bz2
rockbox-652463ecc0085c9e04da17631aa1fdb2703eee80.zip
mpegplayer: Move libmpeg2 files into their own subdirectory so things are less cluttered.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29381 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/mpegplayer/SOURCES30
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/AUTHORS (renamed from apps/plugins/mpegplayer/AUTHORS)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/README (renamed from apps/plugins/mpegplayer/README)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/README.rockbox (renamed from apps/plugins/mpegplayer/README.rockbox)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/attributes.h (renamed from apps/plugins/mpegplayer/attributes.h)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/decode.c (renamed from apps/plugins/mpegplayer/decode.c)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/header.c (renamed from apps/plugins/mpegplayer/header.c)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/idct.c (renamed from apps/plugins/mpegplayer/idct.c)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/idct_arm.S (renamed from apps/plugins/mpegplayer/idct_arm.S)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/idct_armv6.S (renamed from apps/plugins/mpegplayer/idct_armv6.S)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/idct_coldfire.S (renamed from apps/plugins/mpegplayer/idct_coldfire.S)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/motion_comp.c (renamed from apps/plugins/mpegplayer/motion_comp.c)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/motion_comp.h (renamed from apps/plugins/mpegplayer/motion_comp.h)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_c.c (renamed from apps/plugins/mpegplayer/motion_comp_arm_c.c)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_s.S (renamed from apps/plugins/mpegplayer/motion_comp_arm_s.S)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/motion_comp_c.c (renamed from apps/plugins/mpegplayer/motion_comp_c.c)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_c.c (renamed from apps/plugins/mpegplayer/motion_comp_coldfire_c.c)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_s.S (renamed from apps/plugins/mpegplayer/motion_comp_coldfire_s.S)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/mpeg2.h (renamed from apps/plugins/mpegplayer/mpeg2.h)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/mpeg2_internal.h (renamed from apps/plugins/mpegplayer/mpeg2_internal.h)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/mpeg2dec_config.h (renamed from apps/plugins/mpegplayer/mpeg2dec_config.h)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/slice.c (renamed from apps/plugins/mpegplayer/slice.c)0
-rw-r--r--apps/plugins/mpegplayer/libmpeg2/vlc.h (renamed from apps/plugins/mpegplayer/vlc.h)0
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c1
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.h4
-rw-r--r--apps/plugins/mpegplayer/video_out_rockbox.c2
-rw-r--r--apps/plugins/mpegplayer/video_thread.c2
27 files changed, 19 insertions, 20 deletions
diff --git a/apps/plugins/mpegplayer/SOURCES b/apps/plugins/mpegplayer/SOURCES
index cf1e54aff5..3fc079dfbd 100644
--- a/apps/plugins/mpegplayer/SOURCES
+++ b/apps/plugins/mpegplayer/SOURCES
@@ -1,26 +1,28 @@
-alloc.c
-decode.c
-header.c
-idct.c
-motion_comp.c
+libmpeg2/decode.c
+libmpeg2/header.c
+libmpeg2/idct.c
+libmpeg2/motion_comp.c
+libmpeg2/slice.c
#ifdef CPU_COLDFIRE
-idct_coldfire.S
-motion_comp_coldfire_c.c
-motion_comp_coldfire_s.S
+libmpeg2/idct_coldfire.S
+libmpeg2/motion_comp_coldfire_c.c
+libmpeg2/motion_comp_coldfire_s.S
#elif defined CPU_ARM
#if ARM_ARCH >= 6
-idct_armv6.S
+libmpeg2/idct_armv6.S
#else
-idct_arm.S
+libmpeg2/idct_arm.S
#endif
-motion_comp_arm_c.c
-motion_comp_arm_s.S
+libmpeg2/motion_comp_arm_c.c
+libmpeg2/motion_comp_arm_s.S
#else /* other CPU or SIM */
-motion_comp_c.c
+libmpeg2/motion_comp_c.c
#endif /* CPU_* */
-slice.c
+
+
+alloc.c
video_out_rockbox.c
video_thread.c
pcm_output.c
diff --git a/apps/plugins/mpegplayer/AUTHORS b/apps/plugins/mpegplayer/libmpeg2/AUTHORS
index 4722897c97..4722897c97 100644
--- a/apps/plugins/mpegplayer/AUTHORS
+++ b/apps/plugins/mpegplayer/libmpeg2/AUTHORS
diff --git a/apps/plugins/mpegplayer/README b/apps/plugins/mpegplayer/libmpeg2/README
index 2a58846772..2a58846772 100644
--- a/apps/plugins/mpegplayer/README
+++ b/apps/plugins/mpegplayer/libmpeg2/README
diff --git a/apps/plugins/mpegplayer/README.rockbox b/apps/plugins/mpegplayer/libmpeg2/README.rockbox
index 95f5a3d4b5..95f5a3d4b5 100644
--- a/apps/plugins/mpegplayer/README.rockbox
+++ b/apps/plugins/mpegplayer/libmpeg2/README.rockbox
diff --git a/apps/plugins/mpegplayer/attributes.h b/apps/plugins/mpegplayer/libmpeg2/attributes.h
index 24b069223b..24b069223b 100644
--- a/apps/plugins/mpegplayer/attributes.h
+++ b/apps/plugins/mpegplayer/libmpeg2/attributes.h
diff --git a/apps/plugins/mpegplayer/decode.c b/apps/plugins/mpegplayer/libmpeg2/decode.c
index 9c8081efbe..9c8081efbe 100644
--- a/apps/plugins/mpegplayer/decode.c
+++ b/apps/plugins/mpegplayer/libmpeg2/decode.c
diff --git a/apps/plugins/mpegplayer/header.c b/apps/plugins/mpegplayer/libmpeg2/header.c
index 001cafe7d5..001cafe7d5 100644
--- a/apps/plugins/mpegplayer/header.c
+++ b/apps/plugins/mpegplayer/libmpeg2/header.c
diff --git a/apps/plugins/mpegplayer/idct.c b/apps/plugins/mpegplayer/libmpeg2/idct.c
index 7f0b9a3c12..7f0b9a3c12 100644
--- a/apps/plugins/mpegplayer/idct.c
+++ b/apps/plugins/mpegplayer/libmpeg2/idct.c
diff --git a/apps/plugins/mpegplayer/idct_arm.S b/apps/plugins/mpegplayer/libmpeg2/idct_arm.S
index 97a87a8b59..97a87a8b59 100644
--- a/apps/plugins/mpegplayer/idct_arm.S
+++ b/apps/plugins/mpegplayer/libmpeg2/idct_arm.S
diff --git a/apps/plugins/mpegplayer/idct_armv6.S b/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S
index dc53cbd7bd..dc53cbd7bd 100644
--- a/apps/plugins/mpegplayer/idct_armv6.S
+++ b/apps/plugins/mpegplayer/libmpeg2/idct_armv6.S
diff --git a/apps/plugins/mpegplayer/idct_coldfire.S b/apps/plugins/mpegplayer/libmpeg2/idct_coldfire.S
index abc54b16cb..abc54b16cb 100644
--- a/apps/plugins/mpegplayer/idct_coldfire.S
+++ b/apps/plugins/mpegplayer/libmpeg2/idct_coldfire.S
diff --git a/apps/plugins/mpegplayer/motion_comp.c b/apps/plugins/mpegplayer/libmpeg2/motion_comp.c
index d6968f68ce..d6968f68ce 100644
--- a/apps/plugins/mpegplayer/motion_comp.c
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp.c
diff --git a/apps/plugins/mpegplayer/motion_comp.h b/apps/plugins/mpegplayer/libmpeg2/motion_comp.h
index 4737e72cab..4737e72cab 100644
--- a/apps/plugins/mpegplayer/motion_comp.h
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp.h
diff --git a/apps/plugins/mpegplayer/motion_comp_arm_c.c b/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_c.c
index dcf1df53e9..dcf1df53e9 100644
--- a/apps/plugins/mpegplayer/motion_comp_arm_c.c
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_c.c
diff --git a/apps/plugins/mpegplayer/motion_comp_arm_s.S b/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_s.S
index 1ec1b0686e..1ec1b0686e 100644
--- a/apps/plugins/mpegplayer/motion_comp_arm_s.S
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp_arm_s.S
diff --git a/apps/plugins/mpegplayer/motion_comp_c.c b/apps/plugins/mpegplayer/libmpeg2/motion_comp_c.c
index 9a8640e7e6..9a8640e7e6 100644
--- a/apps/plugins/mpegplayer/motion_comp_c.c
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp_c.c
diff --git a/apps/plugins/mpegplayer/motion_comp_coldfire_c.c b/apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_c.c
index b97e3510e7..b97e3510e7 100644
--- a/apps/plugins/mpegplayer/motion_comp_coldfire_c.c
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_c.c
diff --git a/apps/plugins/mpegplayer/motion_comp_coldfire_s.S b/apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_s.S
index 55d87cb708..55d87cb708 100644
--- a/apps/plugins/mpegplayer/motion_comp_coldfire_s.S
+++ b/apps/plugins/mpegplayer/libmpeg2/motion_comp_coldfire_s.S
diff --git a/apps/plugins/mpegplayer/mpeg2.h b/apps/plugins/mpegplayer/libmpeg2/mpeg2.h
index bd14ead96e..bd14ead96e 100644
--- a/apps/plugins/mpegplayer/mpeg2.h
+++ b/apps/plugins/mpegplayer/libmpeg2/mpeg2.h
diff --git a/apps/plugins/mpegplayer/mpeg2_internal.h b/apps/plugins/mpegplayer/libmpeg2/mpeg2_internal.h
index e04562e18d..e04562e18d 100644
--- a/apps/plugins/mpegplayer/mpeg2_internal.h
+++ b/apps/plugins/mpegplayer/libmpeg2/mpeg2_internal.h
diff --git a/apps/plugins/mpegplayer/mpeg2dec_config.h b/apps/plugins/mpegplayer/libmpeg2/mpeg2dec_config.h
index c34ee374df..c34ee374df 100644
--- a/apps/plugins/mpegplayer/mpeg2dec_config.h
+++ b/apps/plugins/mpegplayer/libmpeg2/mpeg2dec_config.h
diff --git a/apps/plugins/mpegplayer/slice.c b/apps/plugins/mpegplayer/libmpeg2/slice.c
index 926333d5d0..926333d5d0 100644
--- a/apps/plugins/mpegplayer/slice.c
+++ b/apps/plugins/mpegplayer/libmpeg2/slice.c
diff --git a/apps/plugins/mpegplayer/vlc.h b/apps/plugins/mpegplayer/libmpeg2/vlc.h
index d1b6a98cde..d1b6a98cde 100644
--- a/apps/plugins/mpegplayer/vlc.h
+++ b/apps/plugins/mpegplayer/libmpeg2/vlc.h
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 97f648621a..2361ba0fbd 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -103,7 +103,6 @@
#include "mpegplayer.h"
#include "lib/helper.h"
#include "mpeg_settings.h"
-#include "mpeg2.h"
#include "video_out.h"
#include "stream_thread.h"
#include "stream_mgr.h"
diff --git a/apps/plugins/mpegplayer/mpegplayer.h b/apps/plugins/mpegplayer/mpegplayer.h
index 7333d87d6e..32cc7b25be 100644
--- a/apps/plugins/mpegplayer/mpegplayer.h
+++ b/apps/plugins/mpegplayer/mpegplayer.h
@@ -23,8 +23,6 @@
#ifndef MPEGPLAYER_H
#define MPEGPLAYER_H
-#include "mpeg2.h"
-
#ifdef HAVE_SCHEDULER_BOOSTCTRL
#define trigger_cpu_boost rb->trigger_cpu_boost
#define cancel_cpu_boost rb->cancel_cpu_boost
@@ -74,7 +72,7 @@
#include "lib/mylcd.h"
-#include "mpeg2.h"
+#include "libmpeg2/mpeg2.h"
#include "video_out.h"
#include "mpeg_stream.h"
#include "mpeg_misc.h"
diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c
index 214bdf3b5c..c659600d41 100644
--- a/apps/plugins/mpegplayer/video_out_rockbox.c
+++ b/apps/plugins/mpegplayer/video_out_rockbox.c
@@ -18,7 +18,7 @@
* KIND, either express or implied.
*
****************************************************************************/
-#include "mpeg2dec_config.h"
+#include "libmpeg2/mpeg2dec_config.h"
#include "plugin.h"
#include "mpegplayer.h"
diff --git a/apps/plugins/mpegplayer/video_thread.c b/apps/plugins/mpegplayer/video_thread.c
index 2bfc5c680b..5119712396 100644
--- a/apps/plugins/mpegplayer/video_thread.c
+++ b/apps/plugins/mpegplayer/video_thread.c
@@ -22,7 +22,7 @@
****************************************************************************/
#include "plugin.h"
#include "mpegplayer.h"
-#include "mpeg2dec_config.h"
+#include "libmpeg2/mpeg2dec_config.h"
#include "lib/grey.h"
#include "video_out.h"
#include "mpeg_settings.h"