- removed the long broken and obsolete PlayMovie code.

ZDoom · Feb 2, 2017 · 1515ab8 · 1515ab8
1 parent becc00a
commit 1515ab8
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 608 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -621,15 +621,13 @@ set( PLAT_WIN32_SOURCES
 	win32/i_rawps2.cpp
 	win32/i_xinput.cpp
 	win32/i_main.cpp
-	win32/i_movie.cpp
 	win32/i_system.cpp
 	win32/i_specialpaths.cpp
 	win32/st_start.cpp
 	win32/win32gliface.cpp
 	win32/win32video.cpp )
 set( PLAT_POSIX_SOURCES
 	posix/i_cd.cpp
-	posix/i_movie.cpp
 	posix/i_steam.cpp )
 set( PLAT_SDL_SOURCES
 	posix/sdl/crashcatcher.c

diff --git a/src/i_movie.h b/src/i_movie.h
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
@@ -54,7 +54,6 @@
 #include "c_dispatch.h"
 #include "s_sndseq.h"
 #include "i_system.h"
-#include "i_movie.h"
 #include "sbar.h"
 #include "m_swap.h"
 #include "a_sharedglobal.h"
@@ -8801,7 +8800,7 @@ int DLevelScript::RunScript ()
 			break;
 
 		case PCD_PLAYMOVIE:
-			STACK(1) = I_PlayMovie (FBehavior::StaticLookupString (STACK(1)));
+			STACK(1) = -1;
 			break;
 
 		case PCD_SETACTORPOSITION:

diff --git a/src/posix/i_movie.cpp b/src/posix/i_movie.cpp
diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp
@@ -1706,7 +1706,6 @@ void D3DFB::NewRefreshRate ()
 
 void D3DFB::Blank ()
 {
-	// Only used by movie player, which isn't working with D3D9 yet.
 }
 
 void D3DFB::SetBlendingRect(int x1, int y1, int x2, int y2)

diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp
@@ -590,11 +590,9 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 					break;
 				case WTS_CONSOLE_DISCONNECT:
 					SessionState |= 2;
-					//I_MovieDisableSound ();
 					break;
 				case WTS_CONSOLE_CONNECT:
 					SessionState &= ~2;
-					//I_MovieResumeSound ();
 					break;
 				}
 			}
@@ -619,10 +617,6 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 				{
 					GSnd->SuspendSound ();
 				}
-				else if (oldstate && !SessionState)
-				{
-					GSnd->MovieResumeSound ();
-				}
 #endif
 			}
 #ifdef _DEBUG
@@ -948,18 +942,6 @@ FString I_GetFromClipboard (bool return_nothing)
 	return retstr;
 }
 
-#include "i_movie.h"
-
-CCMD (playmovie)
-{
-	if (argv.argc() != 2)
-	{
-		Printf ("Usage: playmovie <movie name>\n");
-		return;
-	}
-	I_PlayMovie (argv[1]);
-}
-
 //==========================================================================
 //
 // FInputDevice - Destructor