aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dists/msvc7/scummvm.vcproj12
-rw-r--r--dists/msvc71/scummvm.vcproj12
-rw-r--r--dists/msvc8/scummvm.vcproj12
-rw-r--r--dists/msvc9/scummvm.vcproj12
-rw-r--r--engines/agos/animation.h4
-rw-r--r--engines/saga/introproc_saga2.cpp2
-rw-r--r--engines/scumm/he/animation_he.h2
-rw-r--r--engines/sword1/animation.h4
-rw-r--r--engines/sword2/animation.h4
-rw-r--r--engines/tucker/tucker.h2
-rw-r--r--graphics/module.mk6
-rw-r--r--graphics/video/dxa_decoder.cpp (renamed from graphics/video/dxa_player.cpp)2
-rw-r--r--graphics/video/dxa_decoder.h (renamed from graphics/video/dxa_player.h)0
-rw-r--r--graphics/video/flic_decoder.cpp (renamed from graphics/video/flic_player.cpp)2
-rw-r--r--graphics/video/flic_decoder.h (renamed from graphics/video/flic_player.h)0
-rw-r--r--graphics/video/smk_decoder.cpp (renamed from graphics/video/smk_player.cpp)2
-rw-r--r--graphics/video/smk_decoder.h (renamed from graphics/video/smk_player.h)0
17 files changed, 39 insertions, 39 deletions
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index 465f7aa59a..90a1f5655d 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -1214,16 +1214,16 @@
<Filter
Name="video">
<File
- RelativePath="..\..\graphics\video\dxa_player.cpp">
+ RelativePath="..\..\graphics\video\dxa_decoder.cpp">
</File>
<File
- RelativePath="..\..\graphics\video\dxa_player.h">
+ RelativePath="..\..\graphics\video\dxa_decoder.h">
</File>
<File
- RelativePath="..\..\graphics\video\flic_player.cpp">
+ RelativePath="..\..\graphics\video\flic_decoder.cpp">
</File>
<File
- RelativePath="..\..\graphics\video\flic_player.h">
+ RelativePath="..\..\graphics\video\flic_decoder.h">
</File>
<File
RelativePath="..\..\graphics\video\mpeg_player.cpp">
@@ -1232,10 +1232,10 @@
RelativePath="..\..\graphics\video\mpeg_player.h">
</File>
<File
- RelativePath="..\..\graphics\video\smk_player.cpp">
+ RelativePath="..\..\graphics\video\smk_decoder.cpp">
</File>
<File
- RelativePath="..\..\graphics\video\smk_player.h">
+ RelativePath="..\..\graphics\video\smk_decoder.h">
</File>
<File
RelativePath="..\..\graphics\video\video_player.cpp">
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 7ed5fc5993..5bfd240fc6 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -1228,16 +1228,16 @@
<Filter
Name="video">
<File
- RelativePath="..\..\graphics\video\dxa_player.cpp">
+ RelativePath="..\..\graphics\video\dxa_decoder.cpp">
</File>
<File
- RelativePath="..\..\graphics\video\dxa_player.h">
+ RelativePath="..\..\graphics\video\dxa_decoder.h">
</File>
<File
- RelativePath="..\..\graphics\video\flic_player.cpp">
+ RelativePath="..\..\graphics\video\flic_decoder.cpp">
</File>
<File
- RelativePath="..\..\graphics\video\flic_player.h">
+ RelativePath="..\..\graphics\video\flic_decoder.h">
</File>
<File
RelativePath="..\..\graphics\video\mpeg_player.cpp">
@@ -1246,10 +1246,10 @@
RelativePath="..\..\graphics\video\mpeg_player.h">
</File>
<File
- RelativePath="..\..\graphics\video\smk_player.cpp">
+ RelativePath="..\..\graphics\video\smk_decoder.cpp">
</File>
<File
- RelativePath="..\..\graphics\video\smk_player.h">
+ RelativePath="..\..\graphics\video\smk_decoder.h">
</File>
<File
RelativePath="..\..\graphics\video\video_player.cpp">
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index bf13641015..f25cfa11ff 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -1648,19 +1648,19 @@
Name="video"
>
<File
- RelativePath="..\..\graphics\video\dxa_player.cpp"
+ RelativePath="..\..\graphics\video\dxa_decoder.cpp"
>
</File>
<File
- RelativePath="..\..\graphics\video\dxa_player.h"
+ RelativePath="..\..\graphics\video\dxa_decoder.h"
>
</File>
<File
- RelativePath="..\..\graphics\video\flic_player.cpp"
+ RelativePath="..\..\graphics\video\flic_decoder.cpp"
>
</File>
<File
- RelativePath="..\..\graphics\video\flic_player.h"
+ RelativePath="..\..\graphics\video\flic_decoder.h"
>
</File>
<File
@@ -1672,11 +1672,11 @@
>
</File>
<File
- RelativePath="..\..\graphics\video\smk_player.cpp"
+ RelativePath="..\..\graphics\video\smk_decoder.cpp"
>
</File>
<File
- RelativePath="..\..\graphics\video\smk_player.h"
+ RelativePath="..\..\graphics\video\smk_decoder.h"
>
</File>
<File
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index bd5444f8e9..a2ff0d45a9 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -1653,19 +1653,19 @@
Name="video"
>
<File
- RelativePath="..\..\graphics\video\dxa_player.cpp"
+ RelativePath="..\..\graphics\video\dxa_decoder.cpp"
>
</File>
<File
- RelativePath="..\..\graphics\video\dxa_player.h"
+ RelativePath="..\..\graphics\video\dxa_decoder.h"
>
</File>
<File
- RelativePath="..\..\graphics\video\flic_player.cpp"
+ RelativePath="..\..\graphics\video\flic_decoder.cpp"
>
</File>
<File
- RelativePath="..\..\graphics\video\flic_player.h"
+ RelativePath="..\..\graphics\video\flic_decoder.h"
>
</File>
<File
@@ -1677,11 +1677,11 @@
>
</File>
<File
- RelativePath="..\..\graphics\video\smk_player.cpp"
+ RelativePath="..\..\graphics\video\smk_decoder.cpp"
>
</File>
<File
- RelativePath="..\..\graphics\video\smk_player.h"
+ RelativePath="..\..\graphics\video\smk_decoder.h"
>
</File>
<File
diff --git a/engines/agos/animation.h b/engines/agos/animation.h
index 1077a1d907..9cd6913f08 100644
--- a/engines/agos/animation.h
+++ b/engines/agos/animation.h
@@ -29,8 +29,8 @@
#include "common/file.h"
#include "common/stream.h"
-#include "graphics/video/dxa_player.h"
-#include "graphics/video/smk_player.h"
+#include "graphics/video/dxa_decoder.h"
+#include "graphics/video/smk_decoder.h"
#include "sound/mixer.h"
namespace AGOS {
diff --git a/engines/saga/introproc_saga2.cpp b/engines/saga/introproc_saga2.cpp
index 86b9d6de01..81a60e17e5 100644
--- a/engines/saga/introproc_saga2.cpp
+++ b/engines/saga/introproc_saga2.cpp
@@ -33,7 +33,7 @@
#include "sound/mixer.h"
#include "graphics/surface.h"
-#include "graphics/video/smk_player.h"
+#include "graphics/video/smk_decoder.h"
#include "common/events.h"
#include "common/system.h"
diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h
index 966db0e3f7..39f03960c4 100644
--- a/engines/scumm/he/animation_he.h
+++ b/engines/scumm/he/animation_he.h
@@ -28,7 +28,7 @@
#include "common/file.h"
-#include "graphics/video/smk_player.h"
+#include "graphics/video/smk_decoder.h"
#include "sound/mixer.h"
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 85c9fc70d6..1a380d40b0 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -26,8 +26,8 @@
#ifndef SWORD1_ANIMATION_H
#define SWORD1_ANIMATION_H
-#include "graphics/video/dxa_player.h"
-#include "graphics/video/smk_player.h"
+#include "graphics/video/dxa_decoder.h"
+#include "graphics/video/smk_decoder.h"
#include "graphics/video/video_player.h"
#include "sword1/screen.h"
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index 9a60af2c26..032350d2d6 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -28,8 +28,8 @@
#ifndef SWORD2_ANIMATION_H
#define SWORD2_ANIMATION_H
-#include "graphics/video/dxa_player.h"
-#include "graphics/video/smk_player.h"
+#include "graphics/video/dxa_decoder.h"
+#include "graphics/video/smk_decoder.h"
#include "graphics/video/video_player.h"
#include "sound/mixer.h"
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index d763df3c81..966900c923 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -32,7 +32,7 @@
#include "common/events.h"
#include "common/stream.h"
-#include "graphics/video/flic_player.h"
+#include "graphics/video/flic_decoder.h"
#include "sound/mixer.h"
diff --git a/graphics/module.mk b/graphics/module.mk
index 7eef6ba258..bf93822bee 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -18,10 +18,10 @@ MODULE_OBJS := \
thumbnail.o \
VectorRenderer.o \
VectorRendererSpec.o \
- video/dxa_player.o \
- video/flic_player.o \
+ video/dxa_decoder.o \
+ video/flic_decoder.o \
video/mpeg_player.o \
- video/smk_player.o \
+ video/smk_decoder.o \
video/video_player.o \
video/coktelvideo/indeo3.o \
video/coktelvideo/coktelvideo.o
diff --git a/graphics/video/dxa_player.cpp b/graphics/video/dxa_decoder.cpp
index d0d4d1c67b..e514050942 100644
--- a/graphics/video/dxa_player.cpp
+++ b/graphics/video/dxa_decoder.cpp
@@ -29,7 +29,7 @@
#include "common/system.h"
#include "common/util.h"
-#include "graphics/video/dxa_player.h"
+#include "graphics/video/dxa_decoder.h"
#ifdef USE_ZLIB
#include "common/zlib.h"
diff --git a/graphics/video/dxa_player.h b/graphics/video/dxa_decoder.h
index 384a057c3f..384a057c3f 100644
--- a/graphics/video/dxa_player.h
+++ b/graphics/video/dxa_decoder.h
diff --git a/graphics/video/flic_player.cpp b/graphics/video/flic_decoder.cpp
index e58cf0bdbc..bef232b6e6 100644
--- a/graphics/video/flic_player.cpp
+++ b/graphics/video/flic_decoder.cpp
@@ -23,7 +23,7 @@
*
*/
-#include "graphics/video/flic_player.h"
+#include "graphics/video/flic_decoder.h"
#include "common/archive.h"
#include "common/stream.h"
#include "common/endian.h"
diff --git a/graphics/video/flic_player.h b/graphics/video/flic_decoder.h
index 68bf3fb688..68bf3fb688 100644
--- a/graphics/video/flic_player.h
+++ b/graphics/video/flic_decoder.h
diff --git a/graphics/video/smk_player.cpp b/graphics/video/smk_decoder.cpp
index ebbf61d25a..3d83bbd8ea 100644
--- a/graphics/video/smk_player.cpp
+++ b/graphics/video/smk_decoder.cpp
@@ -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/video/smk_player.h"
+#include "graphics/video/smk_decoder.h"
#include "common/archive.h"
#include "common/array.h"
diff --git a/graphics/video/smk_player.h b/graphics/video/smk_decoder.h
index e70d0e6454..e70d0e6454 100644
--- a/graphics/video/smk_player.h
+++ b/graphics/video/smk_decoder.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 13:23:39 +0000