libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-04 08:17:40 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Move all video players to separate directory

Browse Source 
svn-id: r35470
This commit is contained in:
Eugene Sandulenko 2008-12-21 21:08:17 +00:00
parent be66a538b4
commit 829cbc4110
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/agos/animation.h
View File

@ -29,8 +29,8 @@
#include "common/file.h"
#include "common/stream.h"
#include "graphics/dxa_player.h"
#include "graphics/smk_player.h"
#include "graphics/video/dxa_player.h"
#include "graphics/video/smk_player.h"
#include "sound/mixer.h"
namespace AGOS {

2
engines/scumm/he/animation_he.h
View File

@ -28,7 +28,7 @@
#include "common/file.h"
#include "graphics/smk_player.h"
#include "graphics/video/smk_player.h"
#include "sound/mixer.h"

4
engines/sword1/animation.h
View File

@ -26,8 +26,8 @@
#ifndef SWORD1_ANIMATION_H
#define SWORD1_ANIMATION_H
#include "graphics/dxa_player.h"
#include "graphics/mpeg_player.h"
#include "graphics/video/dxa_player.h"
#include "graphics/video/mpeg_player.h"
#include "sword1/screen.h"
#include "sword1/sound.h"

4
engines/sword2/animation.h
View File

@ -28,8 +28,8 @@
#ifndef SWORD2_ANIMATION_H
#define SWORD2_ANIMATION_H
#include "graphics/dxa_player.h"
#include "graphics/mpeg_player.h"
#include "graphics/video/dxa_player.h"
#include "graphics/video/mpeg_player.h"
#include "sound/mixer.h"
#include "sword2/screen.h"

2
engines/tucker/tucker.h
View File

@ -32,7 +32,7 @@
#include "common/events.h"
#include "common/stream.h"
#include "graphics/flic_player.h"
#include "graphics/video/flic_player.h"
#include "sound/mixer.h"

10
graphics/module.mk
View File

@ -2,8 +2,6 @@ MODULE := graphics
MODULE_OBJS := \
cursorman.o \
dxa_player.o \
flic_player.o \
font.o \
fontman.o \
fonts/consolefont.o \
@ -13,15 +11,17 @@ MODULE_OBJS := \
iff.o \
imagedec.o \
imageman.o \
mpeg_player.o \
primitives.o \
scaler.o \
scaler/thumbnail_intern.o \
smk_player.o \
surface.o \
thumbnail.o \
VectorRenderer.o \
VectorRendererSpec.o
VectorRendererSpec.o \
video/dxa_player.o \
video/flic_player.o \
video/mpeg_player.o \
video/smk_player.o
ifndef DISABLE_SCALERS
MODULE_OBJS += \

2
graphics/dxa_player.cpp → graphics/video/dxa_player.cpp
View File

@ -25,7 +25,7 @@
#include "common/endian.h"
#include "common/archive.h"
#include "graphics/dxa_player.h"
#include "graphics/video/dxa_player.h"
#include "common/util.h"
#ifdef USE_ZLIB

4
graphics/dxa_player.h → graphics/video/dxa_player.h
View File

@ -23,8 +23,8 @@
*
*/
#ifndef GRAPHICS_DXA_PLAYER_H
#define GRAPHICS_DXA_PLAYER_H
#ifndef GRAPHICS_VIDEO_DXA_PLAYER_H
#define GRAPHICS_VIDEO_DXA_PLAYER_H
#include "common/scummsys.h"
#include "common/stream.h"

2
graphics/flic_player.cpp → graphics/video/flic_player.cpp
View File

@ -23,7 +23,7 @@
*
*/
#include "flic_player.h"
#include "graphics/video/flic_player.h"
namespace Graphics {

4
graphics/flic_player.h → graphics/video/flic_player.h
View File

@ -23,8 +23,8 @@
*
*/
#ifndef GRAPHICS_FLICPLAYER_H
#define GRAPHICS_FLICPLAYER_H
#ifndef GRAPHICS_VIDEO_FLICPLAYER_H
#define GRAPHICS_VIDEO_FLICPLAYER_H
#include "common/endian.h"
#include "common/list.h"

2
graphics/mpeg_player.cpp → graphics/video/mpeg_player.cpp
View File

@ -23,7 +23,7 @@
*
*/
#include "graphics/mpeg_player.h"
#include "graphics/video/mpeg_player.h"
#include "common/file.h"
#include "common/system.h"
#include "common/util.h"

4
graphics/mpeg_player.h → graphics/video/mpeg_player.h
View File

@ -23,8 +23,8 @@
*
*/
#ifndef GRAPHICS_MPEG_PLAYER_H
#define GRAPHICS_MPEG_PLAYER_H
#ifndef GRAPHICS_VIDEO_MPEG_PLAYER_H
#define GRAPHICS_VIDEO_MPEG_PLAYER_H
#include "common/scummsys.h"

2
graphics/smk_player.cpp → graphics/video/smk_player.cpp
View File

@ -27,7 +27,7 @@
// and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 16143
// http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=16143&view=markup
#include "graphics/smk_player.h"
#include "graphics/video/smk_player.h"
#include "common/archive.h"
#include "common/system.h"
#include "common/util.h"

4
graphics/smk_player.h → graphics/video/smk_player.h
View File

@ -27,8 +27,8 @@
// and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 16143
// http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=16143&view=markup
#ifndef GRAPHICS_SMK_PLAYER_H
#define GRAPHICS_SMK_PLAYER_H
#ifndef GRAPHICS_VIDEO_SMK_PLAYER_H
#define GRAPHICS_VIDEO_SMK_PLAYER_H
#include "common/scummsys.h"
#include "common/stream.h"