[Scummvm-cvs-logs] SF.net SVN: scummvm:[55473] scummvm/trunk
sev at users.sourceforge.net
sev at users.sourceforge.net
Sun Jan 23 18:14:43 CET 2011
Revision: 55473
http://scummvm.svn.sourceforge.net/scummvm/?rev=55473&view=rev
Author: sev
Date: 2011-01-23 17:14:43 +0000 (Sun, 23 Jan 2011)
Log Message:
-----------
GRAPHICS: Move graphics/video/ to video/. Step 1/2
Modified Paths:
--------------
scummvm/trunk/Makefile.common
scummvm/trunk/engines/agos/animation.h
scummvm/trunk/engines/gob/videoplayer.h
scummvm/trunk/engines/mohawk/video.cpp
scummvm/trunk/engines/mohawk/video.h
scummvm/trunk/engines/saga/introproc_saga2.cpp
scummvm/trunk/engines/sci/console.cpp
scummvm/trunk/engines/sci/engine/kvideo.cpp
scummvm/trunk/engines/sci/video/seq_decoder.h
scummvm/trunk/engines/scumm/he/animation_he.h
scummvm/trunk/engines/sword1/animation.h
scummvm/trunk/engines/sword25/fmv/theora_decoder.h
scummvm/trunk/engines/toon/movie.h
scummvm/trunk/engines/tucker/tucker.h
scummvm/trunk/graphics/module.mk
Added Paths:
-----------
scummvm/trunk/video/
scummvm/trunk/video/module.mk
Removed Paths:
-------------
scummvm/trunk/graphics/video/
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/Makefile.common 2011-01-23 17:14:43 UTC (rev 55473)
@@ -25,6 +25,7 @@
gui \
backends \
engines \
+ video \
graphics \
sound \
common \
Modified: scummvm/trunk/engines/agos/animation.h
===================================================================
--- scummvm/trunk/engines/agos/animation.h 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/agos/animation.h 2011-01-23 17:14:43 UTC (rev 55473)
@@ -28,8 +28,8 @@
#ifndef AGOS_ANIMATION_H
#define AGOS_ANIMATION_H
-#include "graphics/video/dxa_decoder.h"
-#include "graphics/video/smk_decoder.h"
+#include "video/dxa_decoder.h"
+#include "video/smk_decoder.h"
#include "sound/mixer.h"
namespace AGOS {
Modified: scummvm/trunk/engines/gob/videoplayer.h
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.h 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/gob/videoplayer.h 2011-01-23 17:14:43 UTC (rev 55473)
@@ -32,7 +32,7 @@
#include "common/str.h"
#include "graphics/surface.h"
-#include "graphics/video/coktel_decoder.h"
+#include "video/coktel_decoder.h"
#include "gob/util.h"
#include "gob/draw.h"
Modified: scummvm/trunk/engines/mohawk/video.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video.cpp 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/mohawk/video.cpp 2011-01-23 17:14:43 UTC (rev 55473)
@@ -28,7 +28,7 @@
#include "mohawk/video.h"
#include "common/events.h"
-#include "graphics/video/qt_decoder.h"
+#include "video/qt_decoder.h"
namespace Mohawk {
Modified: scummvm/trunk/engines/mohawk/video.h
===================================================================
--- scummvm/trunk/engines/mohawk/video.h 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/mohawk/video.h 2011-01-23 17:14:43 UTC (rev 55473)
@@ -28,7 +28,7 @@
#include "common/array.h"
#include "graphics/pixelformat.h"
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
namespace Mohawk {
Modified: scummvm/trunk/engines/saga/introproc_saga2.cpp
===================================================================
--- scummvm/trunk/engines/saga/introproc_saga2.cpp 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/saga/introproc_saga2.cpp 2011-01-23 17:14:43 UTC (rev 55473)
@@ -33,7 +33,7 @@
#include "sound/mixer.h"
#include "graphics/surface.h"
-#include "graphics/video/smk_decoder.h"
+#include "video/smk_decoder.h"
namespace Saga {
Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/sci/console.cpp 2011-01-23 17:14:43 UTC (rev 55473)
@@ -49,10 +49,10 @@
#include "sci/parser/vocabulary.h"
-#include "graphics/video/avi_decoder.h"
+#include "video/avi_decoder.h"
#include "sci/video/seq_decoder.h"
#ifdef ENABLE_SCI32
-#include "graphics/video/coktel_decoder.h"
+#include "video/coktel_decoder.h"
#endif
#include "common/file.h"
Modified: scummvm/trunk/engines/sci/engine/kvideo.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kvideo.cpp 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/sci/engine/kvideo.cpp 2011-01-23 17:14:43 UTC (rev 55473)
@@ -30,11 +30,11 @@
#include "sci/graphics/palette.h"
#include "sci/graphics/screen.h"
#include "graphics/cursorman.h"
-#include "graphics/video/avi_decoder.h"
-#include "graphics/video/qt_decoder.h"
+#include "video/avi_decoder.h"
+#include "video/qt_decoder.h"
#include "sci/video/seq_decoder.h"
#ifdef ENABLE_SCI32
-#include "graphics/video/coktel_decoder.h"
+#include "video/coktel_decoder.h"
#endif
namespace Sci {
Modified: scummvm/trunk/engines/sci/video/seq_decoder.h
===================================================================
--- scummvm/trunk/engines/sci/video/seq_decoder.h 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/sci/video/seq_decoder.h 2011-01-23 17:14:43 UTC (rev 55473)
@@ -26,7 +26,7 @@
#ifndef SEQ_DECODER_H
#define SEQ_DECODER_H
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
namespace Sci {
Modified: scummvm/trunk/engines/scumm/he/animation_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/animation_he.h 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/scumm/he/animation_he.h 2011-01-23 17:14:43 UTC (rev 55473)
@@ -26,7 +26,7 @@
#if !defined(SCUMM_HE_ANIMATION_H) && defined(ENABLE_HE)
#define SCUMM_HE_ANIMATION_H
-#include "graphics/video/smk_decoder.h"
+#include "video/smk_decoder.h"
#include "sound/mixer.h"
Modified: scummvm/trunk/engines/sword1/animation.h
===================================================================
--- scummvm/trunk/engines/sword1/animation.h 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/sword1/animation.h 2011-01-23 17:14:43 UTC (rev 55473)
@@ -26,9 +26,9 @@
#ifndef SWORD1_ANIMATION_H
#define SWORD1_ANIMATION_H
-#include "graphics/video/dxa_decoder.h"
-#include "graphics/video/smk_decoder.h"
-#include "graphics/video/video_decoder.h"
+#include "video/dxa_decoder.h"
+#include "video/smk_decoder.h"
+#include "video/video_decoder.h"
#include "common/array.h"
Modified: scummvm/trunk/engines/sword25/fmv/theora_decoder.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/theora_decoder.h 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/sword25/fmv/theora_decoder.h 2011-01-23 17:14:43 UTC (rev 55473)
@@ -30,7 +30,7 @@
#ifdef USE_THEORADEC
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
Modified: scummvm/trunk/engines/toon/movie.h
===================================================================
--- scummvm/trunk/engines/toon/movie.h 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/toon/movie.h 2011-01-23 17:14:43 UTC (rev 55473)
@@ -27,7 +27,7 @@
#define TOON_MOVIE_H
#include "toon/toon.h"
-#include "graphics/video/smk_decoder.h"
+#include "video/smk_decoder.h"
namespace Toon {
Modified: scummvm/trunk/engines/tucker/tucker.h
===================================================================
--- scummvm/trunk/engines/tucker/tucker.h 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/engines/tucker/tucker.h 2011-01-23 17:14:43 UTC (rev 55473)
@@ -33,7 +33,7 @@
#include "common/random.h"
#include "common/stream.h"
-#include "graphics/video/flic_decoder.h"
+#include "video/flic_decoder.h"
#include "sound/mixer.h"
Modified: scummvm/trunk/graphics/module.mk
===================================================================
--- scummvm/trunk/graphics/module.mk 2011-01-23 16:22:15 UTC (rev 55472)
+++ scummvm/trunk/graphics/module.mk 2011-01-23 17:14:43 UTC (rev 55473)
@@ -23,25 +23,6 @@
thumbnail.o \
VectorRenderer.o \
VectorRendererSpec.o \
- video/avi_decoder.o \
- video/coktel_decoder.o \
- video/dxa_decoder.o \
- video/flic_decoder.o \
- video/mpeg_player.o \
- video/qt_decoder.o \
- video/smk_decoder.o \
- video/video_decoder.o \
- video/codecs/cdtoons.o \
- video/codecs/cinepak.o \
- video/codecs/indeo3.o \
- video/codecs/mjpeg.o \
- video/codecs/msrle.o \
- video/codecs/msvideo1.o \
- video/codecs/qdm2.o \
- video/codecs/qtrle.o \
- video/codecs/rpza.o \
- video/codecs/smc.o \
- video/codecs/truemotion1.o
ifdef USE_SCALERS
MODULE_OBJS += \
Added: scummvm/trunk/video/module.mk
===================================================================
--- scummvm/trunk/video/module.mk (rev 0)
+++ scummvm/trunk/video/module.mk 2011-01-23 17:14:43 UTC (rev 55473)
@@ -0,0 +1,25 @@
+MODULE := video
+
+MODULE_OBJS := \
+ avi_decoder.o \
+ coktel_decoder.o \
+ dxa_decoder.o \
+ flic_decoder.o \
+ mpeg_player.o \
+ qt_decoder.o \
+ smk_decoder.o \
+ video_decoder.o \
+ codecs/cdtoons.o \
+ codecs/cinepak.o \
+ codecs/indeo3.o \
+ codecs/mjpeg.o \
+ codecs/msrle.o \
+ codecs/msvideo1.o \
+ codecs/qdm2.o \
+ codecs/qtrle.o \
+ codecs/rpza.o \
+ codecs/smc.o \
+ codecs/truemotion1.o
+
+# Include common rules
+include $(srcdir)/rules.mk
Property changes on: scummvm/trunk/video/module.mk
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list