Revert r6058: I stupidly used "git svn dcommit" instead of "git stash pop" (yes I know they don't even look the same...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6059 4a71c877-e1ca-e34f-864e-861f7616d084master
Giel van Schijndel
parent
53d6990a55
commit
becaf21060
|
|
@ -233,7 +233,6 @@ PKG_CHECK_MODULES([SDL], [sdl >= 1.2])
|
||||||
PKG_CHECK_MODULES([OPENAL], [openal >= 0.0.8])
|
PKG_CHECK_MODULES([OPENAL], [openal >= 0.0.8])
|
||||||
PKG_CHECK_MODULES([PNG], [libpng >= 1.2])
|
PKG_CHECK_MODULES([PNG], [libpng >= 1.2])
|
||||||
PKG_CHECK_MODULES([OGGVORBIS], [vorbisfile >= 1.1])
|
PKG_CHECK_MODULES([OGGVORBIS], [vorbisfile >= 1.1])
|
||||||
PKG_CHECK_MODULES([THEORA], [theora >= 0.1])
|
|
||||||
|
|
||||||
# Only accept SQLite versions 3.5.x, with a minimum of 3.5.4.
|
# Only accept SQLite versions 3.5.x, with a minimum of 3.5.4.
|
||||||
PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.6],
|
PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.6],
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,6 @@ AM_CPPFLAGS = $(SDL_CFLAGS) $(WZ_CPPFLAGS)
|
||||||
AM_CFLAGS = $(WZ_CFLAGS)
|
AM_CFLAGS = $(WZ_CFLAGS)
|
||||||
|
|
||||||
noinst_LIBRARIES = libsequence.a
|
noinst_LIBRARIES = libsequence.a
|
||||||
noinst_HEADERS = sequence.h timer.h ogg.h
|
noinst_HEADERS = sequence.h
|
||||||
|
|
||||||
libsequence_a_SOURCES = sequence.c ogg.c timer.c
|
libsequence_a_SOURCES = sequence.c
|
||||||
|
|
|
||||||
|
|
@ -1,990 +0,0 @@
|
||||||
/*
|
|
||||||
This file is part of Warzone 2100.
|
|
||||||
Copyright (C) 1999-2004 Eidos Interactive
|
|
||||||
Copyright (C) 2005-2007 Warzone Resurrection Project
|
|
||||||
|
|
||||||
Warzone 2100 is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Warzone 2100 is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with Warzone 2100; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
// this source uses parts from www.theora.org sample playback code, and
|
|
||||||
// freespace2 source code project http://scp.indiegames.us/
|
|
||||||
//#include <SDL/SDL.h>
|
|
||||||
|
|
||||||
#include <theora/theora.h>
|
|
||||||
#include <vorbis/codec.h>
|
|
||||||
#include <AL/al.h>
|
|
||||||
#include <AL/alc.h>
|
|
||||||
#include "lib/ivis_opengl/GLee.h"
|
|
||||||
#include "lib/framework/frame.h"
|
|
||||||
#include "lib/ivis_opengl/screen.h"
|
|
||||||
#include "lib/framework/frameint.h"
|
|
||||||
#include "lib/ivis_common/piestate.h"
|
|
||||||
#include "lib/gamelib/gtime.h"
|
|
||||||
#include "lib/framework/physfs_ext.h"
|
|
||||||
|
|
||||||
#include "ogg.h"
|
|
||||||
|
|
||||||
#ifndef WIN32
|
|
||||||
#include <unistd.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <time.h>
|
|
||||||
#include "timer.h"
|
|
||||||
|
|
||||||
/// Buffers to hold sound data.
|
|
||||||
ALuint buffer1 = 0, buffer2 = 0;
|
|
||||||
|
|
||||||
/// Sources are points of emitting sound.
|
|
||||||
ALuint source = 0;
|
|
||||||
ALint sourcestate = 0;
|
|
||||||
int totbufstarted = 0;
|
|
||||||
|
|
||||||
//FILE *infile;
|
|
||||||
PHYSFS_file* fpInfile = NULL;
|
|
||||||
PHYSFS_sint64 fsize = 0, fsize2 = 0;
|
|
||||||
|
|
||||||
static BOOL playing = 0;
|
|
||||||
//======================================
|
|
||||||
/* never forget that globals are a one-way ticket to Hell */
|
|
||||||
/* Ogg and codec state for demux/decode */
|
|
||||||
ogg_sync_state oy;
|
|
||||||
ogg_page og;
|
|
||||||
ogg_stream_state vo;
|
|
||||||
ogg_stream_state to;
|
|
||||||
theora_info ti;
|
|
||||||
theora_comment tc;
|
|
||||||
theora_state td;
|
|
||||||
vorbis_info vi;
|
|
||||||
vorbis_dsp_state vd;
|
|
||||||
vorbis_block vb;
|
|
||||||
vorbis_comment vc;
|
|
||||||
|
|
||||||
int theora_p = 0;
|
|
||||||
int vorbis_p = 0;
|
|
||||||
int stateflag = 0;
|
|
||||||
|
|
||||||
/* single frame video buffering */
|
|
||||||
int videobuf_ready = 0;
|
|
||||||
ogg_int64_t videobuf_granulepos = -1;
|
|
||||||
double videobuf_time = 0;
|
|
||||||
|
|
||||||
/* single audio fragment audio buffering */
|
|
||||||
int audiobuf_fill = 0;
|
|
||||||
int audiobuf_ready = 0;
|
|
||||||
ogg_int16_t* audiobuf = NULL;
|
|
||||||
ogg_int64_t audiobuf_granulepos = 0; /* time position of last sample */
|
|
||||||
int audiofd_fragsize;
|
|
||||||
char* RGBAframe = NULL;
|
|
||||||
|
|
||||||
long audiofd_totalsize = 0;
|
|
||||||
double audioTime = 0;
|
|
||||||
double sampletimeOffset = 0;
|
|
||||||
double basetime = -1;
|
|
||||||
double last_time;
|
|
||||||
double timer_expire;
|
|
||||||
bool timer_started = 0;
|
|
||||||
static GLuint backDropTexture2 = ~0;
|
|
||||||
|
|
||||||
int frames = 0;
|
|
||||||
int dropped = 0;
|
|
||||||
int OGGCurrentFrame = 0;
|
|
||||||
int ScrnvidXsize = 0;
|
|
||||||
int ScrnvidYsize = 0;
|
|
||||||
int ScrnvidXpos = 0;
|
|
||||||
int ScrnvidYpos = 0;
|
|
||||||
//======================================
|
|
||||||
extern char datadir[PATH_MAX];
|
|
||||||
//prototypes
|
|
||||||
int OGG_buffer_data ( PHYSFS_file *in, ogg_sync_state *oy );
|
|
||||||
static void open_audio ( void );
|
|
||||||
double getTimeNow ( void );
|
|
||||||
double getRelativeTime ( void );
|
|
||||||
void seq_InitOgg ( void );
|
|
||||||
static void audio_write ( void );
|
|
||||||
void OGG_timer_do_wait ( void );
|
|
||||||
void OGG_SetFrameCounter( int frame);
|
|
||||||
//**********************************************************************************
|
|
||||||
// Helper; just grab some more compressed bitstream and sync it for page extraction
|
|
||||||
int OGG_buffer_data( PHYSFS_file *in, ogg_sync_state *oy )
|
|
||||||
{
|
|
||||||
// read in 4K chunks
|
|
||||||
char *buffer = ogg_sync_buffer( oy, 4096 );
|
|
||||||
int bytes = PHYSFS_read( in, buffer, 1, 4096 );
|
|
||||||
|
|
||||||
ogg_sync_wrote( oy, bytes );
|
|
||||||
return( bytes );
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
/** helper: push a page into the appropriate steam
|
|
||||||
this can be done blindly; a stream won't accept a page
|
|
||||||
that doesn't belong to it
|
|
||||||
*/
|
|
||||||
static int OGG_queue_page( ogg_page *page )
|
|
||||||
{
|
|
||||||
if( theora_p )
|
|
||||||
{
|
|
||||||
ogg_stream_pagein( &to, page );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( vorbis_p )
|
|
||||||
{
|
|
||||||
ogg_stream_pagein( &vo, page );
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
// sets the OGGCurrentFrame number we are on
|
|
||||||
void OGG_SetFrameCounter( int frame)
|
|
||||||
{
|
|
||||||
OGGCurrentFrame = frame;
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
// Just telling the world what frame # we are on.
|
|
||||||
int OGG_GetFrameCounter( void )
|
|
||||||
{
|
|
||||||
return OGGCurrentFrame;
|
|
||||||
}
|
|
||||||
void OGG_SetSize( int sizeX, int sizeY, int posX, int posY)
|
|
||||||
{
|
|
||||||
ScrnvidXsize = sizeX;
|
|
||||||
ScrnvidYsize = sizeY;
|
|
||||||
ScrnvidXpos = posX;
|
|
||||||
ScrnvidYpos = posY;
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
static void open_audio( void )
|
|
||||||
{
|
|
||||||
audiofd_fragsize = ( ((vi.channels * 16) / 8) * vi.rate );
|
|
||||||
audiobuf = malloc( audiofd_fragsize );
|
|
||||||
|
|
||||||
// openal
|
|
||||||
alGenSources( 1, &source );
|
|
||||||
|
|
||||||
// Create an OpenAL buffer and fill it with the decoded data
|
|
||||||
alGenBuffers( 1, &buffer1 );
|
|
||||||
alGenBuffers( 1, &buffer2 );
|
|
||||||
|
|
||||||
// Clear Error Codes
|
|
||||||
alGetError();
|
|
||||||
totbufstarted = 0;
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
static void audio_close( void )
|
|
||||||
{
|
|
||||||
audiobuf_fill = 0;
|
|
||||||
audiobuf_granulepos = 0;
|
|
||||||
audiofd_fragsize = 0;
|
|
||||||
source = 0;
|
|
||||||
buffer1 = buffer2 = 0;
|
|
||||||
if( audiobuf )
|
|
||||||
{
|
|
||||||
free( audiobuf );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
// Retrieves the current time with millisecond accuracy
|
|
||||||
double getTimeNow( void )
|
|
||||||
{
|
|
||||||
return Timer_getElapsedMilliSecs();
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
// get relative time since beginning playback, compensating for A/V drift
|
|
||||||
double getRelativeTime( void )
|
|
||||||
{
|
|
||||||
if( basetime == -1 ) // check to see if this is first time run
|
|
||||||
{
|
|
||||||
basetime = getTimeNow();
|
|
||||||
timer_expire = Timer_getElapsedMicroSecs();
|
|
||||||
timer_expire += ( int ) ( (videobuf_time - getTimeNow()) * 1000000.0 );
|
|
||||||
timer_started = true;
|
|
||||||
}
|
|
||||||
return( (getTimeNow() - basetime) * .001 );
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
// sync the time if we must.
|
|
||||||
void OGG_timer_do_wait( void )
|
|
||||||
{
|
|
||||||
int tv, ts, ts2;
|
|
||||||
|
|
||||||
if( !timer_started )
|
|
||||||
{
|
|
||||||
getRelativeTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
tv = Timer_getElapsedMicroSecs();
|
|
||||||
|
|
||||||
if( tv <= timer_expire )
|
|
||||||
{
|
|
||||||
ts = timer_expire - tv;
|
|
||||||
ts2 = ts / 1000;
|
|
||||||
printf( "sleeping for %d\n", ts2 );
|
|
||||||
#ifdef WIN32
|
|
||||||
Sleep( ts2 );
|
|
||||||
#else
|
|
||||||
sleep( ts2 );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
timer_expire += ( (videobuf_time - getRelativeTime()) * 1000000.0 );
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
static void OGG_Allocate_videoFrame( void )
|
|
||||||
{
|
|
||||||
RGBAframe = malloc( ti.frame_width * ti.frame_height * 4 );
|
|
||||||
}
|
|
||||||
|
|
||||||
#define Vclip( x ) ( (x > 0) ? ((x < 255) ? x : 255) : 0 )
|
|
||||||
//**********************************************************************************
|
|
||||||
static void video_write( BOOL update )
|
|
||||||
{
|
|
||||||
int x = 0, y = 0;
|
|
||||||
yuv_buffer yuv;
|
|
||||||
|
|
||||||
if( update )
|
|
||||||
{
|
|
||||||
theora_decode_YUVout( &td, &yuv );
|
|
||||||
|
|
||||||
// fill the RGBA buffer
|
|
||||||
for( y = 0; y < ti.frame_height; y++ )
|
|
||||||
{
|
|
||||||
for( x = 0; x < ti.frame_width; x++ )
|
|
||||||
{
|
|
||||||
int Y = yuv.y[x + y * yuv.y_stride];
|
|
||||||
int U = yuv.u[x / 2 + ( y / 2 ) * yuv.uv_stride];
|
|
||||||
int V = yuv.v[x / 2 + ( y / 2 ) * yuv.uv_stride];
|
|
||||||
|
|
||||||
int C = Y - 16;
|
|
||||||
int D = U - 128;
|
|
||||||
int E = V - 128;
|
|
||||||
|
|
||||||
int R = Vclip( (298 * C + 409 * E + 128) >> 8 );
|
|
||||||
int G = Vclip( (298 * C - 100 * D - 208 * E + 128) >> 8 );
|
|
||||||
int B = Vclip( (298 * C + 516 * D + 128) >> 8 );
|
|
||||||
|
|
||||||
RGBAframe[x * 4 + y * ti.frame_width * 4 + 0] = R;
|
|
||||||
RGBAframe[x * 4 + y * ti.frame_width * 4 + 1] = G;
|
|
||||||
RGBAframe[x * 4 + y * ti.frame_width * 4 + 2] = B;
|
|
||||||
RGBAframe[x * 4 + y * ti.frame_width * 4 + 3] = 0xFF;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( backDropTexture2 != ~0 )
|
|
||||||
{
|
|
||||||
glDeleteTextures( 1, &backDropTexture2 );
|
|
||||||
}
|
|
||||||
// NOTE: should we have 2 paths, 1 for cards that support NPOT textures or not?
|
|
||||||
/*
|
|
||||||
glGenTextures( 1, &backDropTexture );
|
|
||||||
|
|
||||||
glBindTexture( GL_TEXTURE_2D, backDropTexture );
|
|
||||||
glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, ti.frame_width, ti.frame_height, 0, GL_RGBA,
|
|
||||||
GL_UNSIGNED_BYTE, RGBAframe );
|
|
||||||
|
|
||||||
glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
|
|
||||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
|
|
||||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
|
|
||||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
|
|
||||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );
|
|
||||||
*/
|
|
||||||
// fallback routine for cards that don't support NPOT textures [FORCE TESTING--for now]
|
|
||||||
glGenTextures( 1, &backDropTexture2);
|
|
||||||
glEnable( GL_TEXTURE_RECTANGLE_ARB);
|
|
||||||
glBindTexture( GL_TEXTURE_RECTANGLE_ARB, backDropTexture2);
|
|
||||||
glTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, ti.frame_width, ti.frame_height, 0, GL_RGBA,
|
|
||||||
GL_UNSIGNED_BYTE, RGBAframe );
|
|
||||||
|
|
||||||
glTexParameteri( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
|
|
||||||
glTexParameteri( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
|
|
||||||
glTexParameterf( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP );
|
|
||||||
glTexParameterf( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP );
|
|
||||||
glBindTexture( GL_TEXTURE_RECTANGLE_ARB, 0 );
|
|
||||||
glDisable( GL_TEXTURE_RECTANGLE_ARB );
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
glDisable( GL_DEPTH_TEST );
|
|
||||||
glDepthMask( GL_FALSE );
|
|
||||||
|
|
||||||
// Make sure the current texture page is reloaded after we are finished
|
|
||||||
// Otherwise WZ will think it is still loaded and not load it again
|
|
||||||
pie_SetTexturePage( -1 );
|
|
||||||
|
|
||||||
// NOTE: should we have 2 paths, 1 for cards that support NPOT textures or not?
|
|
||||||
/*
|
|
||||||
glEnable( GL_TEXTURE_2D );
|
|
||||||
glBindTexture( GL_TEXTURE_2D, backDropTexture );
|
|
||||||
glColor3f( 1, 1, 1 );
|
|
||||||
|
|
||||||
glBegin( GL_TRIANGLE_STRIP );
|
|
||||||
glTexCoord2f( 0, 0 );
|
|
||||||
glVertex2f( 0, 0 );
|
|
||||||
glTexCoord2f( 255, 0 );
|
|
||||||
glVertex2f( screenWidth, 0 );
|
|
||||||
glTexCoord2f( 0, 255 );
|
|
||||||
glVertex2f( 0, screenHeight );
|
|
||||||
glTexCoord2f( 255, 255 );
|
|
||||||
glVertex2f( screenWidth, screenHeight );
|
|
||||||
glEnd();
|
|
||||||
*/
|
|
||||||
// fallback routine for cards that don't support NPOT textures [FORCE TESTING--for now]
|
|
||||||
if(!GLEE_ARB_texture_rectangle)
|
|
||||||
{
|
|
||||||
debug(LOG_ERROR, "You got some really crappy hardware! GL_TEXTURE_RECTANGLE_ARB not supported! :P");
|
|
||||||
debug(LOG_ERROR, "Video will not show!");
|
|
||||||
}
|
|
||||||
glPushMatrix();
|
|
||||||
glEnable(GL_TEXTURE_RECTANGLE_ARB);
|
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, backDropTexture2);
|
|
||||||
|
|
||||||
// NOTE: 255 * width | height, because texture matrix is set up with a
|
|
||||||
// call to glScalef(1/256.0, 1/256.0, 1) ... so don't blame me. :P
|
|
||||||
glTranslatef(ScrnvidXpos,ScrnvidYpos,0.0f);
|
|
||||||
glBegin( GL_TRIANGLE_STRIP );
|
|
||||||
glTexCoord2f( 0, 0 );
|
|
||||||
glVertex2f( 0, 0 );
|
|
||||||
glTexCoord2f( 255* ti.frame_width, 0 );
|
|
||||||
glVertex2f( ScrnvidXsize, 0 );//screenWidth
|
|
||||||
glTexCoord2f( 0, 255* ti.frame_height );
|
|
||||||
glVertex2f( 0, ScrnvidYsize );//screenHeight
|
|
||||||
glTexCoord2f( 255*ti.frame_width, 255* ti.frame_height );
|
|
||||||
glVertex2f( ScrnvidXsize, ScrnvidYsize);//screenWidth,screenHeight
|
|
||||||
glEnd();
|
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
|
|
||||||
glDisable(GL_TEXTURE_RECTANGLE_ARB);
|
|
||||||
glPopMatrix();
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
// dump the theora (or vorbis) comment header
|
|
||||||
static void dump_comments( theora_comment *tc )
|
|
||||||
{
|
|
||||||
|
|
||||||
int i = 0, len = 0;
|
|
||||||
char *value = NULL;
|
|
||||||
|
|
||||||
debug( LOG_VIDEO, "Encoded by %s", tc->vendor );
|
|
||||||
if( tc->comments )
|
|
||||||
{
|
|
||||||
debug( LOG_VIDEO, "theora comment header:" );
|
|
||||||
for( i = 0; i < tc->comments; i++ )
|
|
||||||
{
|
|
||||||
if( tc->user_comments[i] )
|
|
||||||
{
|
|
||||||
len = tc->comment_lengths[i];
|
|
||||||
value = malloc( len + 1 );
|
|
||||||
memcpy( value, tc->user_comments[i], len );
|
|
||||||
value[len] = '\0';
|
|
||||||
debug( LOG_VIDEO, "\t%s", value );
|
|
||||||
free( value );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
/** Report the encoder-specified colorspace for the video, if any.
|
|
||||||
We don't actually make use of the information in this example;
|
|
||||||
a real player should attempt to perform color correction for
|
|
||||||
whatever display device it supports. */
|
|
||||||
static void report_colorspace( theora_info *ti )
|
|
||||||
{
|
|
||||||
switch( ti->colorspace ) {
|
|
||||||
case OC_CS_UNSPECIFIED:
|
|
||||||
/* nothing to report */
|
|
||||||
break;
|
|
||||||
case OC_CS_ITU_REC_470M:
|
|
||||||
debug( LOG_VIDEO, " encoder specified ITU Rec 470M (NTSC) color.\n" );
|
|
||||||
break;
|
|
||||||
case OC_CS_ITU_REC_470BG:
|
|
||||||
debug( LOG_VIDEO, " encoder specified ITU Rec 470BG (PAL) color.\n" );
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
debug( LOG_WARNING, "encoder specified unknown colorspace (%d).\n", ti->colorspace );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
// FIXME: perhaps we should use wz's routine for audio?
|
|
||||||
// loads up the audio buffers, and calculates audio sync time.
|
|
||||||
static void audio_write( void )
|
|
||||||
{
|
|
||||||
ALint processed;
|
|
||||||
ALint queued;
|
|
||||||
|
|
||||||
alGetSourcei( source, AL_BUFFERS_PROCESSED, &processed );
|
|
||||||
alGetSourcei( source, AL_BUFFERS_QUEUED, &queued );
|
|
||||||
if( (totbufstarted < 2 || processed) && audiobuf_fill > 0 )
|
|
||||||
{
|
|
||||||
// we have audiobuf_fill bytes of data
|
|
||||||
ALuint oldbuffer;
|
|
||||||
|
|
||||||
if( totbufstarted == 0 )
|
|
||||||
{
|
|
||||||
oldbuffer = buffer1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
if( totbufstarted == 1 )
|
|
||||||
{
|
|
||||||
oldbuffer = buffer2;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ALint buffer_size;
|
|
||||||
ogg_int64_t current_sample;
|
|
||||||
|
|
||||||
alSourceUnqueueBuffers( source, 1, &oldbuffer );
|
|
||||||
alGetBufferi( oldbuffer, AL_SIZE, &buffer_size );
|
|
||||||
// audio time sync
|
|
||||||
audioTime += ( double ) buffer_size / ( vi.rate * vi.channels );
|
|
||||||
debug(LOG_VIDEO, "Audio sync");
|
|
||||||
current_sample = audiobuf_granulepos - audiobuf_fill / 2 / vi.channels;
|
|
||||||
sampletimeOffset -= getTimeNow() - 1000 * current_sample / vi.rate;
|
|
||||||
}
|
|
||||||
|
|
||||||
alBufferData( oldbuffer, (vi.channels == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16),
|
|
||||||
audiobuf, audiobuf_fill, vi.rate );
|
|
||||||
|
|
||||||
alSourceQueueBuffers( source, 1, &oldbuffer );
|
|
||||||
totbufstarted++;
|
|
||||||
if( totbufstarted > 2 )
|
|
||||||
{
|
|
||||||
totbufstarted = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( sourcestate != AL_PLAYING )
|
|
||||||
{
|
|
||||||
debug( LOG_VIDEO, "seq_UpdateOgg: starting source\n" );
|
|
||||||
alSourcePlay( source );
|
|
||||||
}
|
|
||||||
|
|
||||||
audiobuf_ready = 0;
|
|
||||||
audiobuf_fill = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
// rint hack, since windows don't have rint!
|
|
||||||
double rint( double x )
|
|
||||||
{
|
|
||||||
int a = 0;
|
|
||||||
|
|
||||||
if( ceil( x + 0.5 ) == floor( x + 0.5 ) )
|
|
||||||
{
|
|
||||||
a = ( int ) ceil( x );
|
|
||||||
if( a % 2 == 0 )
|
|
||||||
{
|
|
||||||
return ceil( x );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return floor( x );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return floor( x + 0.5 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
/**
|
|
||||||
* Display the next frame and play the sound.
|
|
||||||
* \return FALSE if the end of the video is reached.
|
|
||||||
*/
|
|
||||||
int seq_UpdateOgg( void )
|
|
||||||
{
|
|
||||||
ogg_packet op;
|
|
||||||
int i, j;
|
|
||||||
int ret;
|
|
||||||
float ** pcm;
|
|
||||||
int count, maxsamples;
|
|
||||||
|
|
||||||
/* we want a video and audio frame ready to go at all times. If
|
|
||||||
we have to buffer incoming, buffer the compressed data (ie, let
|
|
||||||
ogg do the buffering) */
|
|
||||||
if( !playing )
|
|
||||||
{
|
|
||||||
debug( LOG_WARNING, "seq_UpdateOgg: no movie playing" );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
while( vorbis_p && !audiobuf_ready )
|
|
||||||
{
|
|
||||||
/* if there's pending, decoded audio, grab it */
|
|
||||||
if( (ret = vorbis_synthesis_pcmout( &vd, &pcm )) > 0 )
|
|
||||||
{
|
|
||||||
// we now have float pcm data in pcm
|
|
||||||
// going to convert that to int pcm in audiobuf
|
|
||||||
count = audiobuf_fill / 2;
|
|
||||||
maxsamples = ( audiofd_fragsize - audiobuf_fill ) / 2 / vi.channels;
|
|
||||||
|
|
||||||
for( i = 0; i < ret && i < maxsamples; i++ )
|
|
||||||
{
|
|
||||||
for( j = 0; j < vi.channels; j++ )
|
|
||||||
{
|
|
||||||
int val = rint( pcm[j][i] * 32767.f );
|
|
||||||
|
|
||||||
if( val > 32767 )
|
|
||||||
{
|
|
||||||
val = 32767;
|
|
||||||
}
|
|
||||||
else if( val < -32768 )
|
|
||||||
{
|
|
||||||
val = -32768;
|
|
||||||
}
|
|
||||||
audiobuf[count++] = val;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
vorbis_synthesis_read( &vd, i );
|
|
||||||
audiobuf_fill += i * vi.channels * 2;
|
|
||||||
|
|
||||||
if( audiobuf_fill == audiofd_fragsize )
|
|
||||||
{
|
|
||||||
audiobuf_ready = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( vd.granulepos >= 0 )
|
|
||||||
{
|
|
||||||
audiobuf_granulepos = vd.granulepos - ret + i;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
audiobuf_granulepos += i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* no pending audio; is there a pending packet to decode? */
|
|
||||||
if( ogg_stream_packetout( &vo, &op ) > 0 )
|
|
||||||
{
|
|
||||||
if( vorbis_synthesis( &vb, &op ) == 0 )
|
|
||||||
{ /* test for success! */
|
|
||||||
vorbis_synthesis_blockin( &vd, &vb );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{ /* we need more data; break out to suck in another page */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
while( theora_p && !videobuf_ready )
|
|
||||||
{
|
|
||||||
/* theora is one in, one out... */
|
|
||||||
if( ogg_stream_packetout( &to, &op ) > 0 )
|
|
||||||
{
|
|
||||||
double now_time = 0;
|
|
||||||
double delay = 0;
|
|
||||||
|
|
||||||
theora_decode_packetin( &td, &op );
|
|
||||||
videobuf_granulepos = td.granulepos;
|
|
||||||
videobuf_time = theora_granule_time( &td, videobuf_granulepos );
|
|
||||||
|
|
||||||
now_time = getRelativeTime();
|
|
||||||
delay = videobuf_time - getRelativeTime();
|
|
||||||
|
|
||||||
if( (delay >= 0.0f) || (now_time - last_time >= 1.0f) )
|
|
||||||
{
|
|
||||||
videobuf_ready = true;
|
|
||||||
OGG_SetFrameCounter(frames++);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// running slow, so we skip this frame
|
|
||||||
dropped++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
alGetSourcei( source, AL_SOURCE_STATE, &sourcestate );
|
|
||||||
|
|
||||||
if( !videobuf_ready && !audiobuf_ready && PHYSFS_eof( fpInfile ) && sourcestate != AL_PLAYING &&
|
|
||||||
audiobuf_fill == 0 )
|
|
||||||
{
|
|
||||||
video_write( false );
|
|
||||||
seq_ShutdownOgg();
|
|
||||||
debug( LOG_VIDEO, "seq_UpdateOgg: video finished" );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( !videobuf_ready || !audiobuf_ready )
|
|
||||||
{
|
|
||||||
/* no data yet for somebody. Grab another page */
|
|
||||||
ret = OGG_buffer_data( fpInfile, &oy );
|
|
||||||
while( ogg_sync_pageout( &oy, &og ) > 0 )
|
|
||||||
{
|
|
||||||
OGG_queue_page( &og );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If playback has begun, top audio buffer off immediately. */
|
|
||||||
if( vorbis_p && stateflag )
|
|
||||||
{
|
|
||||||
//debug(LOG_VIDEO, "seq_UpdateOgg: starting playback\n");
|
|
||||||
// play the data in pcm
|
|
||||||
audio_write();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* are we at or past time for this video frame? */
|
|
||||||
if( stateflag && videobuf_ready && (videobuf_time <= getRelativeTime()) )
|
|
||||||
{
|
|
||||||
video_write( true );
|
|
||||||
last_time = getRelativeTime();
|
|
||||||
videobuf_ready = false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
if( stateflag )
|
|
||||||
{
|
|
||||||
video_write( false );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if our buffers either don't exist or are ready to go,
|
|
||||||
we can begin playback */
|
|
||||||
if( (!theora_p || videobuf_ready) && (!vorbis_p || audiobuf_ready) && !stateflag )
|
|
||||||
{
|
|
||||||
debug( LOG_VIDEO, "seq_UpdateOgg: all buffers ready" );
|
|
||||||
stateflag = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//debug(LOG_VIDEO, "theora_p: %i, videobuf_ready: %i, vorbis_p: %i, audiobuf_ready: %i", theora_p, videobuf_ready, vorbis_p, audiobuf_ready);
|
|
||||||
/* same if we've run out of input */
|
|
||||||
if( PHYSFS_eof( fpInfile ) )
|
|
||||||
{
|
|
||||||
stateflag = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( videobuf_ready )
|
|
||||||
{
|
|
||||||
OGG_timer_do_wait();
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
void seq_InitOgg( void )
|
|
||||||
{
|
|
||||||
debug( LOG_VIDEO, "seq_InitOgg" );
|
|
||||||
|
|
||||||
ASSERT((ScrnvidXsize && ScrnvidYsize ),"Screen dimensions not specified!");
|
|
||||||
|
|
||||||
stateflag = 0;
|
|
||||||
theora_p = 0;
|
|
||||||
vorbis_p = 0;
|
|
||||||
playing = false;
|
|
||||||
|
|
||||||
/* single frame video buffering */
|
|
||||||
videobuf_ready = 0;
|
|
||||||
videobuf_granulepos = -1;
|
|
||||||
videobuf_time = 0;
|
|
||||||
OGGCurrentFrame = 0;
|
|
||||||
/* single audio fragment audio buffering */
|
|
||||||
audiobuf_fill = 0;
|
|
||||||
audiobuf_ready = 0;
|
|
||||||
|
|
||||||
audiobuf_granulepos = 0; /* time position of last sample */
|
|
||||||
|
|
||||||
audioTime = 0;
|
|
||||||
sampletimeOffset = 0;
|
|
||||||
|
|
||||||
/* start up Ogg stream synchronization layer */
|
|
||||||
ogg_sync_init( &oy );
|
|
||||||
|
|
||||||
/* init supporting Vorbis structures needed in header parsing */
|
|
||||||
vorbis_info_init( &vi );
|
|
||||||
vorbis_comment_init( &vc );
|
|
||||||
|
|
||||||
/* init supporting Theora structuretotbufstarteds needed in header parsing */
|
|
||||||
theora_comment_init( &tc );
|
|
||||||
theora_info_init( &ti );
|
|
||||||
Timer_Init();
|
|
||||||
Timer_start();
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
BOOL seq_PlayOgg( char *filename)
|
|
||||||
{
|
|
||||||
char kludge[512];
|
|
||||||
int len = 0;
|
|
||||||
int pp_level_max = 0;
|
|
||||||
int pp_level = 0;
|
|
||||||
int pp_inc = 0;
|
|
||||||
ogg_packet op;
|
|
||||||
|
|
||||||
debug( LOG_VIDEO, "seq_PlayOgg(\"%s\")", filename );
|
|
||||||
|
|
||||||
if( playing )
|
|
||||||
{
|
|
||||||
debug( LOG_WARNING, "seq_PlayOgg: previous movie is not yet finished" );
|
|
||||||
seq_ShutdownOgg();
|
|
||||||
}
|
|
||||||
|
|
||||||
seq_InitOgg();
|
|
||||||
strcpy( kludge, filename );
|
|
||||||
len = strlen( filename );
|
|
||||||
kludge[len - 3] = 'o';
|
|
||||||
kludge[len - 2] = 'g';
|
|
||||||
kludge[len - 1] = 'g';
|
|
||||||
fpInfile = PHYSFS_openRead( kludge );
|
|
||||||
if( fpInfile == NULL )
|
|
||||||
{
|
|
||||||
debug( LOG_ERROR, "seq_PlayOgg: unable to open '%s' for playback [%s]", kludge, datadir );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
theora_p = 0;
|
|
||||||
vorbis_p = 0;
|
|
||||||
|
|
||||||
/* Ogg file open; parse the headers */
|
|
||||||
/* Only interested in Vorbis/Theora streams */
|
|
||||||
while( !stateflag )
|
|
||||||
{
|
|
||||||
int ret = OGG_buffer_data( fpInfile, &oy );
|
|
||||||
|
|
||||||
if( ret == 0 )
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
while( ogg_sync_pageout( &oy, &og ) > 0 )
|
|
||||||
{
|
|
||||||
ogg_stream_state test;
|
|
||||||
|
|
||||||
/* is this a mandated initial header? If not, stop parsing */
|
|
||||||
if( !ogg_page_bos( &og ) )
|
|
||||||
{
|
|
||||||
/* don't leak the page; get it into the appropriate stream */
|
|
||||||
OGG_queue_page( &og );
|
|
||||||
stateflag = 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
ogg_stream_init( &test, ogg_page_serialno( &og ) );
|
|
||||||
ogg_stream_pagein( &test, &og );
|
|
||||||
ogg_stream_packetout( &test, &op );
|
|
||||||
|
|
||||||
/* identify the codec: try theora */
|
|
||||||
if( !theora_p && theora_decode_header( &ti, &tc, &op ) >= 0 )
|
|
||||||
{
|
|
||||||
/* it is theora */
|
|
||||||
memcpy( &to, &test, sizeof(test) );
|
|
||||||
theora_p = 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
if( !vorbis_p && vorbis_synthesis_headerin( &vi, &vc, &op ) >= 0 )
|
|
||||||
{
|
|
||||||
/* it is vorbis */
|
|
||||||
memcpy( &vo, &test, sizeof(test) );
|
|
||||||
vorbis_p = 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* whatever it is, we don't care about it */
|
|
||||||
ogg_stream_clear( &test );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* fall through to non-bos page parsing */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* we're expecting more header packets. */
|
|
||||||
while( (theora_p && theora_p < 3) || (vorbis_p && vorbis_p < 3) )
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
/* look for further theora headers */
|
|
||||||
while( theora_p && (theora_p < 3) && (ret = ogg_stream_packetout( &to, &op )) )
|
|
||||||
{
|
|
||||||
if( ret < 0 )
|
|
||||||
{
|
|
||||||
debug( LOG_ERROR, "Error parsing Theora stream headers; corrupt stream?\n" );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( theora_decode_header( &ti, &tc, &op ) )
|
|
||||||
{
|
|
||||||
debug( LOG_ERROR, "Error parsing Theora stream headers; corrupt stream?\n" );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
theora_p++;
|
|
||||||
|
|
||||||
//if (theora_p == 3)
|
|
||||||
//{
|
|
||||||
// break;
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* look for more vorbis header packets */
|
|
||||||
while( vorbis_p && (vorbis_p < 3) && (ret = ogg_stream_packetout( &vo, &op )) )
|
|
||||||
{
|
|
||||||
if( ret < 0 )
|
|
||||||
{
|
|
||||||
debug( LOG_ERROR, "Error parsing Vorbis stream headers; corrupt stream?\n" );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( vorbis_synthesis_headerin( &vi, &vc, &op ) )
|
|
||||||
{
|
|
||||||
debug( LOG_ERROR, "Error parsing Vorbis stream headers; corrupt stream?\n" );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
vorbis_p++;
|
|
||||||
|
|
||||||
//if (vorbis_p == 3)
|
|
||||||
//{
|
|
||||||
// break;
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* The header pages/packets will arrive before anything else we
|
|
||||||
care about, or the stream is not obeying spec */
|
|
||||||
if( ogg_sync_pageout( &oy, &og ) > 0 )
|
|
||||||
{
|
|
||||||
OGG_queue_page( &og ); /* demux into the appropriate stream */
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
int ret = OGG_buffer_data( fpInfile, &oy ); /* someone needs more data */
|
|
||||||
|
|
||||||
if( ret == 0 )
|
|
||||||
{
|
|
||||||
debug( LOG_ERROR, "End of file while searching for codec headers.\n" );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* and now we have it all. initialize decoders */
|
|
||||||
if( theora_p )
|
|
||||||
{
|
|
||||||
theora_decode_init( &td, &ti );
|
|
||||||
debug( LOG_VIDEO, "Ogg logical stream %x is Theora %dx%d %.02f fps video",
|
|
||||||
( unsigned int ) to.serialno, ( int ) ti.width, ( int ) ti.height,
|
|
||||||
( double ) ti.fps_numerator / ti.fps_denominator );
|
|
||||||
if( ti.width != ti.frame_width || ti.height != ti.frame_height )
|
|
||||||
{
|
|
||||||
debug( LOG_VIDEO, " Frame content is %dx%d with offset (%d,%d)", ti.frame_width,
|
|
||||||
ti.frame_height, ti.offset_x, ti.offset_y );
|
|
||||||
}
|
|
||||||
|
|
||||||
report_colorspace( &ti );
|
|
||||||
dump_comments( &tc );
|
|
||||||
|
|
||||||
// hmm
|
|
||||||
theora_control( &td, TH_DECCTL_GET_PPLEVEL_MAX, &pp_level_max, sizeof(pp_level_max) );
|
|
||||||
pp_level = pp_level_max;
|
|
||||||
theora_control( &td, TH_DECCTL_SET_PPLEVEL, &pp_level, sizeof(pp_level) );
|
|
||||||
pp_inc = 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* tear down the partial theora setup */
|
|
||||||
theora_info_clear( &ti );
|
|
||||||
theora_comment_clear( &tc );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( vorbis_p )
|
|
||||||
{
|
|
||||||
vorbis_synthesis_init( &vd, &vi );
|
|
||||||
vorbis_block_init( &vd, &vb );
|
|
||||||
debug( LOG_VIDEO, "Ogg logical stream %x is Vorbis %d channel %d Hz audio",
|
|
||||||
( unsigned int ) vo.serialno, vi.channels, ( int ) vi.rate );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* tear down the partial vorbis setup */
|
|
||||||
vorbis_info_clear( &vi );
|
|
||||||
vorbis_comment_clear( &vc );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* open audio */
|
|
||||||
if( vorbis_p )
|
|
||||||
{
|
|
||||||
open_audio();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* open video */
|
|
||||||
if( theora_p )
|
|
||||||
{
|
|
||||||
OGG_Allocate_videoFrame();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* on to the main decode loop. We assume in this example that audio
|
|
||||||
and video start roughly together, and don't begin playback until
|
|
||||||
we have a start frame for both. This is not necessarily a valid
|
|
||||||
assumption in Ogg A/V streams! It will always be true of the
|
|
||||||
example_encoder (and most streams) though. */
|
|
||||||
sampletimeOffset = getTimeNow();
|
|
||||||
playing = true;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
//**********************************************************************************
|
|
||||||
void seq_ShutdownOgg( void )
|
|
||||||
{
|
|
||||||
/* tear it all down */
|
|
||||||
debug( LOG_VIDEO, "seq_ShutdownOgg" );
|
|
||||||
|
|
||||||
if( !playing )
|
|
||||||
{
|
|
||||||
debug( LOG_WARNING, "seq_ShutdownOgg: movie is not playing" );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( vorbis_p )
|
|
||||||
{
|
|
||||||
ogg_stream_clear( &vo );
|
|
||||||
vorbis_block_clear( &vb );
|
|
||||||
vorbis_dsp_clear( &vd );
|
|
||||||
vorbis_comment_clear( &vc );
|
|
||||||
vorbis_info_clear( &vi );
|
|
||||||
|
|
||||||
alDeleteSources( 1, &source );
|
|
||||||
alDeleteBuffers( 1, &buffer1 );
|
|
||||||
alDeleteBuffers( 1, &buffer2 );
|
|
||||||
|
|
||||||
audio_close();
|
|
||||||
}
|
|
||||||
|
|
||||||
if( theora_p )
|
|
||||||
{
|
|
||||||
ogg_stream_clear( &to );
|
|
||||||
theora_clear( &td );
|
|
||||||
theora_comment_clear( &tc );
|
|
||||||
theora_info_clear( &ti );
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
ogg_sync_clear( &oy );
|
|
||||||
|
|
||||||
if( fpInfile )
|
|
||||||
{
|
|
||||||
PHYSFS_close( fpInfile );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( RGBAframe)
|
|
||||||
{
|
|
||||||
free(RGBAframe);
|
|
||||||
}
|
|
||||||
playing = false;
|
|
||||||
Timer_stop();
|
|
||||||
|
|
||||||
audioTime = sampletimeOffset = last_time = timer_expire = timer_started = 0;
|
|
||||||
basetime = -1;
|
|
||||||
pie_SetTexturePage(-1);
|
|
||||||
debug( LOG_VIDEO, " **** frames = %d dropped = %d ****", frames, dropped );
|
|
||||||
}
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
/*
|
|
||||||
This file is part of Warzone 2100.
|
|
||||||
Copyright (C) 1999-2004 Eidos Interactive
|
|
||||||
Copyright (C) 2005-2007 Warzone Resurrection Project
|
|
||||||
|
|
||||||
Warzone 2100 is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Warzone 2100 is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with Warzone 2100; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _theora_h
|
|
||||||
#define _theora_h
|
|
||||||
|
|
||||||
extern int seq_PlayOgg(char *filename);
|
|
||||||
extern int seq_UpdateOgg(void);
|
|
||||||
extern void seq_ShutdownOgg(void);
|
|
||||||
extern int OGG_GetFrameCounter( void );
|
|
||||||
extern void OGG_SetSize( int sizeX, int sizeY, int posX, int posY);
|
|
||||||
#endif
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
ProjectGUID="{30F5FC4A-31F5-42F5-9581-45309559382F}"
|
ProjectGUID="{30F5FC4A-31F5-42F5-9581-45309559382F}"
|
||||||
RootNamespace="sequence"
|
RootNamespace="sequence"
|
||||||
Keyword="Win32Proj"
|
Keyword="Win32Proj"
|
||||||
|
TargetFrameworkVersion="131072"
|
||||||
>
|
>
|
||||||
<Platforms>
|
<Platforms>
|
||||||
<Platform
|
<Platform
|
||||||
|
|
@ -148,44 +149,20 @@
|
||||||
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||||
>
|
>
|
||||||
<File
|
|
||||||
RelativePath=".\ogg.c"
|
|
||||||
>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Debug|Win32"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
WarningLevel="3"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath=".\sequence.c"
|
RelativePath=".\sequence.c"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath=".\timer.c"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
<Filter
|
||||||
Name="Header Files"
|
Name="Header Files"
|
||||||
Filter="h;hpp;hxx;hm;inl;inc;xsd"
|
Filter="h;hpp;hxx;hm;inl;inc;xsd"
|
||||||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
|
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
|
||||||
>
|
>
|
||||||
<File
|
|
||||||
RelativePath=".\ogg.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath=".\sequence.h"
|
RelativePath=".\sequence.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath=".\timer.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
</Filter>
|
||||||
</Files>
|
</Files>
|
||||||
<Globals>
|
<Globals>
|
||||||
|
|
|
||||||
|
|
@ -1,110 +0,0 @@
|
||||||
/*
|
|
||||||
This file is part of Warzone 2100.
|
|
||||||
Copyright (C) 1999-2004 Eidos Interactive
|
|
||||||
Copyright (C) 2005-2007 Warzone Resurrection Project
|
|
||||||
|
|
||||||
Warzone 2100 is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Warzone 2100 is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with Warzone 2100; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
//#include <windows.h>
|
|
||||||
//#include <time.h>
|
|
||||||
#else
|
|
||||||
#include <sys/time.h>
|
|
||||||
#endif
|
|
||||||
#include "timer.h"
|
|
||||||
#include "lib/framework/frame.h"
|
|
||||||
|
|
||||||
static double startTimeInMicroSec = 0; // starting time in microseconds
|
|
||||||
static double endTimeInMicroSec = 0; // ending time in microseconds
|
|
||||||
static BOOL stopped = false; // stop flag
|
|
||||||
#ifdef WIN32
|
|
||||||
static double freq = 0;
|
|
||||||
static LARGE_INTEGER frequency = {0}; // ticks per second
|
|
||||||
static LARGE_INTEGER startCount = {0};
|
|
||||||
static LARGE_INTEGER endCount = {0};
|
|
||||||
#else
|
|
||||||
static struct timeval startCount;
|
|
||||||
static struct timeval endCount;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Uses the highest resolution timers avail on windows & linux
|
|
||||||
void Timer_Init(void)
|
|
||||||
{
|
|
||||||
#ifdef WIN32
|
|
||||||
// Note, may have to enable this for QPC!
|
|
||||||
//SetThreadAffinityMask()
|
|
||||||
QueryPerformanceFrequency(&frequency);
|
|
||||||
startCount.QuadPart = 0;
|
|
||||||
endCount.QuadPart = 0;
|
|
||||||
freq = 1000000.0f / frequency.QuadPart;
|
|
||||||
#else
|
|
||||||
startCount.tv_sec = startCount.tv_usec = 0;
|
|
||||||
endCount.tv_sec = endCount.tv_usec = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
stopped = false;
|
|
||||||
startTimeInMicroSec = 0;
|
|
||||||
endTimeInMicroSec = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
void Timer_start(void)
|
|
||||||
{
|
|
||||||
stopped = false; // reset stop flag
|
|
||||||
#ifdef WIN32
|
|
||||||
QueryPerformanceCounter(&startCount);
|
|
||||||
#else
|
|
||||||
gettimeofday(&startCount, NULL);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
void Timer_stop(void)
|
|
||||||
{
|
|
||||||
stopped = true; // set timer stopped flag
|
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
QueryPerformanceCounter(&endCount);
|
|
||||||
#else
|
|
||||||
gettimeofday(&endCount, NULL);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
double Timer_getElapsedMicroSecs(void)
|
|
||||||
{
|
|
||||||
#ifdef WIN32
|
|
||||||
if(!stopped)
|
|
||||||
{
|
|
||||||
QueryPerformanceCounter(&endCount);
|
|
||||||
}
|
|
||||||
startTimeInMicroSec = (double)startCount.QuadPart * freq;
|
|
||||||
endTimeInMicroSec = (double)endCount.QuadPart * freq;
|
|
||||||
#else
|
|
||||||
if(!stopped)
|
|
||||||
{
|
|
||||||
gettimeofday(&endCount, NULL);
|
|
||||||
}
|
|
||||||
startTimeInMicroSec = (startCount.tv_sec * 1000000.0) + startCount.tv_usec;
|
|
||||||
endTimeInMicroSec = (endCount.tv_sec * 1000000.0) + endCount.tv_usec;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return endTimeInMicroSec - startTimeInMicroSec;
|
|
||||||
}
|
|
||||||
double Timer_getElapsedMilliSecs(void)
|
|
||||||
{
|
|
||||||
return Timer_getElapsedMicroSecs() * 0.001;// (or) / 1000.0f; * is faster?
|
|
||||||
}
|
|
||||||
double Timer_getElapsedSecs(void)
|
|
||||||
{
|
|
||||||
return Timer_getElapsedMicroSecs()* 0.000001; // (or) /1000000.0f;
|
|
||||||
}
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
/*
|
|
||||||
This file is part of Warzone 2100.
|
|
||||||
Copyright (C) 1999-2004 Eidos Interactive
|
|
||||||
Copyright (C) 2005-2007 Warzone Resurrection Project
|
|
||||||
|
|
||||||
Warzone 2100 is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
Warzone 2100 is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with Warzone 2100; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
#ifndef _timer_h
|
|
||||||
#define _timer_h
|
|
||||||
|
|
||||||
void Timer_Init(void);
|
|
||||||
void Timer_start(void); // start timer
|
|
||||||
void Timer_stop(void); // stop the timer
|
|
||||||
double Timer_getElapsedSecs(void); // get elapsed time in seconds
|
|
||||||
double Timer_getElapsedMilliSecs(void); // get elapsed time in milliseconds
|
|
||||||
double Timer_getElapsedMicroSecs(void); // get elapsed time in microseconds
|
|
||||||
|
|
||||||
#endif
|
|
||||||
1285
po/en_GB.po
1285
po/en_GB.po
File diff suppressed because it is too large
Load Diff
1301
po/pt_BR.po
1301
po/pt_BR.po
File diff suppressed because it is too large
Load Diff
1031
po/zh_CN.po
1031
po/zh_CN.po
File diff suppressed because it is too large
Load Diff
|
|
@ -75,7 +75,7 @@ warzone2100_LDADD = \
|
||||||
$(top_builddir)/lib/framework/libframework.a \
|
$(top_builddir)/lib/framework/libframework.a \
|
||||||
$(top_builddir)/lib/exceptionhandler/libexceptionhandler.a
|
$(top_builddir)/lib/exceptionhandler/libexceptionhandler.a
|
||||||
|
|
||||||
warzone2100_LDADD += $(SDL_LIBS) $(SDL_NET_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(POPT_LIBS) $(SQLITE_LIBS)
|
warzone2100_LDADD += $(SDL_LIBS) $(SDL_NET_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(OGGVORBIS_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(POPT_LIBS) $(SQLITE_LIBS)
|
||||||
|
|
||||||
if MINGW32
|
if MINGW32
|
||||||
warzone2100_LDADD += $(top_builddir)/win32/warzone2100.o $(WIN32_LIBS)
|
warzone2100_LDADD += $(top_builddir)/win32/warzone2100.o $(WIN32_LIBS)
|
||||||
|
|
|
||||||
|
|
@ -242,8 +242,8 @@ BOOL startTitleMenu(void)
|
||||||
addTextButton(FRONTEND_MULTIPLAYER, FRONTEND_POS3X, FRONTEND_POS3Y, _("Multi Player"), false, false);
|
addTextButton(FRONTEND_MULTIPLAYER, FRONTEND_POS3X, FRONTEND_POS3Y, _("Multi Player"), false, false);
|
||||||
addTextButton(FRONTEND_TUTORIAL, FRONTEND_POS4X, FRONTEND_POS4Y, _("Tutorial") ,false,false);
|
addTextButton(FRONTEND_TUTORIAL, FRONTEND_POS4X, FRONTEND_POS4Y, _("Tutorial") ,false,false);
|
||||||
addTextButton(FRONTEND_OPTIONS, FRONTEND_POS5X, FRONTEND_POS5Y, _("Options") ,false,false);
|
addTextButton(FRONTEND_OPTIONS, FRONTEND_POS5X, FRONTEND_POS5Y, _("Options") ,false,false);
|
||||||
addTextButton(FRONTEND_PLAYINTRO, FRONTEND_POS6X, FRONTEND_POS6Y, _("View Intro"), false, false);
|
|
||||||
addTextButton(FRONTEND_QUIT, FRONTEND_POS7X, FRONTEND_POS7Y, _("Quit Game"), false, false);
|
addTextButton(FRONTEND_QUIT, FRONTEND_POS6X, FRONTEND_POS6Y, _("Quit Game"), false, false);
|
||||||
|
|
||||||
addSideText(FRONTEND_SIDETEXT, FRONTEND_SIDEX, FRONTEND_SIDEY, _("MAIN MENU"));
|
addSideText(FRONTEND_SIDETEXT, FRONTEND_SIDEX, FRONTEND_SIDEY, _("MAIN MENU"));
|
||||||
|
|
||||||
|
|
@ -274,9 +274,6 @@ BOOL runTitleMenu(void)
|
||||||
case FRONTEND_TUTORIAL:
|
case FRONTEND_TUTORIAL:
|
||||||
changeTitleMode(TUTORIAL);
|
changeTitleMode(TUTORIAL);
|
||||||
break;
|
break;
|
||||||
case FRONTEND_PLAYINTRO:
|
|
||||||
changeTitleMode(SHOWINTRO);
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -59,10 +59,10 @@
|
||||||
|
|
||||||
#include "multiplay.h"
|
#include "multiplay.h"
|
||||||
#include "lib/sound/cdaudio.h"
|
#include "lib/sound/cdaudio.h"
|
||||||
#include "lib/sequence/ogg.h"
|
|
||||||
#include "scriptextern.h"
|
#include "scriptextern.h"
|
||||||
|
|
||||||
//#define NO_VIDEO
|
#define NO_VIDEO
|
||||||
|
|
||||||
/* Intelligence Map screen IDs */
|
/* Intelligence Map screen IDs */
|
||||||
#define IDINTMAP_MSGFORM 6001 //The intelligence map tabbed form
|
#define IDINTMAP_MSGFORM 6001 //The intelligence map tabbed form
|
||||||
|
|
@ -665,7 +665,6 @@ BOOL intAddMessageView(MESSAGE * psMessage)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*Add the text box*/
|
/*Add the text box*/
|
||||||
|
|
@ -1083,7 +1082,9 @@ void intRemoveMessageView(BOOL animated)
|
||||||
|
|
||||||
//stop the video
|
//stop the video
|
||||||
psViewResearch = (VIEW_RESEARCH *)Form->pUserData;
|
psViewResearch = (VIEW_RESEARCH *)Form->pUserData;
|
||||||
seq_RenderVideoToBuffer( psViewResearch->sequenceName, SEQUENCE_KILL);
|
seq_RenderVideoToBuffer(NULL, psViewResearch->sequenceName,
|
||||||
|
gameTime2, SEQUENCE_KILL);
|
||||||
|
|
||||||
|
|
||||||
if (animated)
|
if (animated)
|
||||||
{
|
{
|
||||||
|
|
@ -1315,18 +1316,18 @@ void intDisplayFLICView(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIG
|
||||||
x1 = x0 + Form->width;
|
x1 = x0 + Form->width;
|
||||||
y1 = y0 + Form->height;
|
y1 = y0 + Form->height;
|
||||||
|
|
||||||
|
|
||||||
if (((VIEWDATA *)psMessage->pViewData)->type != VIEW_RES)
|
if (((VIEWDATA *)psMessage->pViewData)->type != VIEW_RES)
|
||||||
{
|
{
|
||||||
ASSERT( false, "intDisplayFLICView: Invalid message type" );
|
ASSERT( false, "intDisplayFLICView: Invalid message type" );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RenderWindowFrame(FRAME_NORMAL, x0, y0, x1 - x0, y1 - y0);
|
|
||||||
psViewResearch = (VIEW_RESEARCH *)((VIEWDATA *)psCurrentMsg->pViewData)->pData;
|
|
||||||
// set the dimensions to window size & position
|
|
||||||
OGG_SetSize(192,168,x0,y0);
|
|
||||||
//render a frame of the current movie
|
//render a frame of the current movie
|
||||||
seq_RenderVideoToBuffer( psViewResearch->sequenceName, SEQUENCE_HOLD);
|
psViewResearch = (VIEW_RESEARCH *)((VIEWDATA *)psCurrentMsg->pViewData)->pData;
|
||||||
|
seq_RenderVideoToBuffer(NULL, psViewResearch->sequenceName,
|
||||||
|
gameTime2, SEQUENCE_HOLD);
|
||||||
|
//download to screen now
|
||||||
|
seq_BlitBufferToScreen((SBYTE *)rendSurface.buffer, x0, y0);
|
||||||
CloseButtonRender();
|
CloseButtonRender();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1473,7 +1474,7 @@ void displayImmediateMessage(MESSAGE *psMessage)
|
||||||
This has to be changed to support a script calling a message in the intellegence screen
|
This has to be changed to support a script calling a message in the intellegence screen
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef NO_VIDEO
|
#ifdef NO_VIDEO
|
||||||
psCurrentMsg = psMessage;
|
psCurrentMsg = psMessage;
|
||||||
/* so we lied about definately not starting the intelligence screen */
|
/* so we lied about definately not starting the intelligence screen */
|
||||||
addIntelScreen();
|
addIntelScreen();
|
||||||
|
|
|
||||||
279
src/seqdisp.c
279
src/seqdisp.c
|
|
@ -24,7 +24,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "lib/framework/frame.h"
|
#include "lib/framework/frame.h"
|
||||||
#include "lib/framework/frameint.h"
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <SDL_timer.h>
|
#include <SDL_timer.h>
|
||||||
#include <physfs.h>
|
#include <physfs.h>
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
#include "lib/framework/file.h"
|
#include "lib/framework/file.h"
|
||||||
#include "lib/ivis_common/rendmode.h"
|
#include "lib/ivis_common/rendmode.h"
|
||||||
#include "lib/ivis_opengl/screen.h"
|
#include "lib/ivis_opengl/screen.h"
|
||||||
#include "lib/sequence/ogg.h"
|
#include "lib/sequence/sequence.h"
|
||||||
#include "lib/sound/audio.h"
|
#include "lib/sound/audio.h"
|
||||||
#include "lib/sound/cdaudio.h"
|
#include "lib/sound/cdaudio.h"
|
||||||
#include "lib/script/script.h"
|
#include "lib/script/script.h"
|
||||||
|
|
@ -92,25 +92,14 @@ static BOOL bHoldSeqForAudio = false;
|
||||||
static BOOL bCDPath = false;
|
static BOOL bCDPath = false;
|
||||||
static BOOL bHardPath = false;
|
static BOOL bHardPath = false;
|
||||||
static BOOL bSeqSubtitles = true;
|
static BOOL bSeqSubtitles = true;
|
||||||
static BOOL bSeqPlaying = false;
|
|
||||||
|
|
||||||
// static char aCDPath[MAX_STR_LENGTH];
|
|
||||||
static char aHardPath[MAX_STR_LENGTH];
|
static char aHardPath[MAX_STR_LENGTH];
|
||||||
static char aVideoName[MAX_STR_LENGTH];
|
static char aVideoName[MAX_STR_LENGTH];
|
||||||
// static char aAudioName[MAX_STR_LENGTH];
|
|
||||||
// static char aTextName[MAX_STR_LENGTH];
|
|
||||||
// static char aSubtitleName[MAX_STR_LENGTH];
|
|
||||||
static char* pVideoBuffer = NULL;
|
|
||||||
static char* pVideoPalette = NULL;
|
|
||||||
//static VIDEO_MODE videoMode;
|
|
||||||
//static PERF_MODE perfMode = VIDEO_PERF_FULLSCREEN;
|
|
||||||
static SDWORD frameSkip = 1;
|
|
||||||
static SEQLIST aSeqList[MAX_SEQ_LIST];
|
static SEQLIST aSeqList[MAX_SEQ_LIST];
|
||||||
static SDWORD currentSeq = -1;
|
static SDWORD currentSeq = -1;
|
||||||
static SDWORD currentPlaySeq = -1;
|
static SDWORD currentPlaySeq = -1;
|
||||||
static BOOL g_bResumeInGame = false;
|
static BOOL g_bResumeInGame = false;
|
||||||
|
|
||||||
// static unsigned int time_started = 0;
|
static unsigned int time_started = 0;
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
/*
|
/*
|
||||||
|
|
@ -120,11 +109,7 @@ static BOOL g_bResumeInGame = false;
|
||||||
|
|
||||||
static void seq_SetVideoPath(void);
|
static void seq_SetVideoPath(void);
|
||||||
static BOOL seq_StartFullScreenVideo(const char* videoName, const char* audioName);
|
static BOOL seq_StartFullScreenVideo(const char* videoName, const char* audioName);
|
||||||
BOOL seq_BlitBufferToScreen(char* screen, SDWORD screenStride, SDWORD xOffset, SDWORD yOffset);
|
|
||||||
BOOL seq_SetupVideoBuffers(void);
|
|
||||||
BOOL seq_ReleaseVideoBuffers(void);
|
|
||||||
static BOOL SeqEndCallBack( void *psObj );
|
|
||||||
static BOOL seq_StartBufVideo(const char* videoName, const char* audioName);
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
/*
|
/*
|
||||||
* Source
|
* Source
|
||||||
|
|
@ -132,119 +117,17 @@ static BOOL seq_StartBufVideo(const char* videoName, const char* audioName);
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
/* Renders a video sequence specified by filename to a buffer*/
|
/* Renders a video sequence specified by filename to a buffer*/
|
||||||
BOOL seq_RenderVideoToBuffer(const char* sequenceName, int seqCommand)
|
BOOL seq_RenderVideoToBuffer(iSurface* pSurface, const char* sequenceName, int time, int seqCommand)
|
||||||
{
|
{
|
||||||
#define VIDEO_FINISHED 0
|
|
||||||
#define RPL_FRAME_TIME 1
|
|
||||||
|
|
||||||
BOOL state = true;
|
|
||||||
static int frame = -1;
|
|
||||||
static int HOLD = 0;
|
|
||||||
// int videoFrameTime = 0;
|
|
||||||
// int perfMode = 0;
|
|
||||||
// int frameDuration = 0;
|
|
||||||
// int videoTime = 0;
|
|
||||||
// int frameLag = 0;
|
|
||||||
|
|
||||||
if (seqCommand == SEQUENCE_KILL)
|
if (seqCommand == SEQUENCE_KILL)
|
||||||
{
|
{
|
||||||
//stop the movie
|
//stop the movie
|
||||||
seq_ShutdownOgg();
|
seq_Shutdown();
|
||||||
bSeqPlaying = false;
|
|
||||||
HOLD = false;
|
|
||||||
frame = -1;
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!bSeqPlaying && !HOLD )
|
seq_StartFullScreenVideo(sequenceName, NULL);
|
||||||
{
|
|
||||||
//start the ball rolling
|
|
||||||
|
|
||||||
iV_SetFont(font_regular);
|
|
||||||
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
|
|
||||||
|
|
||||||
frame = seq_StartBufVideo(sequenceName, NULL);
|
|
||||||
bSeqPlaying = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (frame != VIDEO_FINISHED)
|
|
||||||
{
|
|
||||||
frame = seq_UpdateOgg();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (frame == VIDEO_FINISHED)
|
|
||||||
{
|
|
||||||
// if (seqCommand == SEQUENCE_LOOP)
|
|
||||||
// {
|
|
||||||
// bSeqPlaying = false;
|
|
||||||
// state = true;
|
|
||||||
// }
|
|
||||||
// if (seqCommand == SEQUENCE_HOLD)
|
|
||||||
// {
|
|
||||||
// //wait for call to stop video
|
|
||||||
// state = true;
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
state = false;
|
|
||||||
// seq_ShutDown();
|
|
||||||
seq_ShutdownOgg();
|
|
||||||
bSeqPlaying = false;
|
|
||||||
HOLD = true;
|
|
||||||
frame = -1;
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOL seq_BlitBufferToScreen(char* screen, SDWORD screenStride, SDWORD xOffset, SDWORD yOffset)
|
|
||||||
{
|
|
||||||
#if 0
|
|
||||||
int i,j;
|
|
||||||
char c8, *d8;
|
|
||||||
UWORD c16, *p16;
|
|
||||||
SDWORD width, height;
|
|
||||||
seq_GetFrameSize(&width, &height);
|
|
||||||
|
|
||||||
if (videoMode == VIDEO_SOFT_WINDOW)
|
|
||||||
{
|
|
||||||
d8 = screen + xOffset + yOffset * screenStride;
|
|
||||||
p16 = (UWORD*)pVideoBuffer;
|
|
||||||
|
|
||||||
for (j = 0; j < height; j++)
|
|
||||||
{
|
|
||||||
for (i = 0; i < width; i++)
|
|
||||||
{
|
|
||||||
c16 = p16[i];
|
|
||||||
c16 &= RPL_MASK_555;
|
|
||||||
c8 = pVideoPalette[c16];
|
|
||||||
d8[i] = c8;
|
|
||||||
}
|
|
||||||
d8 += screenStride;
|
|
||||||
p16 += width;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* pie_DownLoadBufferToScreen(pVideoBuffer, xOffset, yOffset,width,height,(2*width)); no longer exists */
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
return true;
|
|
||||||
SeqEndCallBack( NULL );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
BOOL seq_ReleaseVideoBuffers(void)
|
|
||||||
{
|
|
||||||
free(pVideoBuffer);
|
|
||||||
free(pVideoPalette);
|
|
||||||
pVideoBuffer = NULL;
|
|
||||||
pVideoPalette = NULL;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOL seq_SetupVideoBuffers(void)
|
|
||||||
{
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -258,13 +141,6 @@ static void seq_SetVideoPath(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static BOOL SeqEndCallBack( void *psObj )
|
|
||||||
{
|
|
||||||
bAudioPlaying = false;
|
|
||||||
debug(LOG_NEVER, "************* briefing ended **************");
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
//full screenvideo functions
|
//full screenvideo functions
|
||||||
static BOOL seq_StartFullScreenVideo(const char* videoName, const char* audioName)
|
static BOOL seq_StartFullScreenVideo(const char* videoName, const char* audioName)
|
||||||
{
|
{
|
||||||
|
|
@ -272,8 +148,6 @@ static BOOL seq_StartFullScreenVideo(const char* videoName, const char* audioNam
|
||||||
bHoldSeqForAudio = false;
|
bHoldSeqForAudio = false;
|
||||||
int chars_printed;
|
int chars_printed;
|
||||||
|
|
||||||
frameSkip = 1;
|
|
||||||
|
|
||||||
//set a valid video path if there is one
|
//set a valid video path if there is one
|
||||||
if(!bCDPath && !bHardPath)
|
if(!bCDPath && !bHardPath)
|
||||||
{
|
{
|
||||||
|
|
@ -298,125 +172,57 @@ static BOOL seq_StartFullScreenVideo(const char* videoName, const char* audioNam
|
||||||
iV_SetFont(font_regular);
|
iV_SetFont(font_regular);
|
||||||
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
|
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
if (!seq_Play(aVideoName))
|
if (!seq_Play(aVideoName))
|
||||||
{
|
{
|
||||||
// don't stop or cancel it as we may have text to display
|
// don't stop or cancel it as we may have text to display
|
||||||
debug( LOG_WARNING,"seq_StartFullScreenVideo: unable to initialise sequence %s",aVideoName );
|
debug( LOG_WARNING,"seq_StartFullScreenVideo: unable to initialise sequence %s",aVideoName );
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
// set the dimensions to show full screen
|
|
||||||
OGG_SetSize(screenWidth,screenHeight,0,0);
|
|
||||||
|
|
||||||
if (!seq_PlayOgg(aVideoName))
|
|
||||||
{
|
|
||||||
|
|
||||||
seq_ShutdownOgg();
|
|
||||||
//dunno why we assert if abort vid?
|
|
||||||
// ASSERT( false,"seq_StartFullScreenVideo: unable to initialise sequence %s",aVideoName );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (audioName == NULL)
|
if (audioName == NULL)
|
||||||
{
|
{
|
||||||
bAudioPlaying = false;
|
bAudioPlaying = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
static const float maxVolume = 1.f; //NOT controlled by sliders for now?
|
static const float maxVolume = 1.f;
|
||||||
|
|
||||||
bAudioPlaying = audio_PlayStream(aAudioName, maxVolume, NULL, NULL) ? true : false;
|
bAudioPlaying = audio_PlayStream(aAudioName, maxVolume, NULL, NULL) ? true : false;
|
||||||
ASSERT(bAudioPlaying == true, "seq_StartFullScreenVideo: unable to initialise sound %s", aAudioName);
|
ASSERT(bAudioPlaying == true, "seq_StartFullScreenVideo: unable to initialise sound %s", aAudioName);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
time_started = SDL_GetTicks();
|
||||||
}
|
|
||||||
static BOOL seq_StartBufVideo(const char* videoName, const char* audioName)
|
|
||||||
{
|
|
||||||
const char* aAudioName;
|
|
||||||
bHoldSeqForAudio = false;
|
|
||||||
|
|
||||||
//set a valid video path if there is one
|
|
||||||
if(!bCDPath && !bHardPath)
|
|
||||||
{
|
|
||||||
seq_SetVideoPath();
|
|
||||||
}
|
|
||||||
|
|
||||||
ASSERT( (strlen(videoName) + strlen(aHardPath))<MAX_STR_LENGTH,"sequence path+name greater than max string" );
|
|
||||||
snprintf(aVideoName, sizeof(aVideoName), "%s%s", aHardPath, videoName);
|
|
||||||
|
|
||||||
//set audio path
|
|
||||||
if (audioName != NULL)
|
|
||||||
{
|
|
||||||
ASSERT( strlen(audioName) < MAX_STR_LENGTH, "sequence path+name greater than max string" );
|
|
||||||
sasprintf((char**)&aAudioName, "sequenceaudio/%s", audioName);
|
|
||||||
}
|
|
||||||
|
|
||||||
cdAudio_Pause();
|
|
||||||
iV_SetFont(font_regular);
|
|
||||||
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
|
|
||||||
|
|
||||||
if (!seq_PlayOgg(aVideoName))
|
|
||||||
{
|
|
||||||
seq_ShutdownOgg();
|
|
||||||
//dunno why we assert if abort vid?
|
|
||||||
// ASSERT( false,"seq_StartFullScreenVideo: unable to initialise sequence %s",aVideoName );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (audioName == NULL)
|
|
||||||
{
|
|
||||||
bAudioPlaying = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
static const float maxVolume = 1.f; //NOT controlled by sliders for now?
|
|
||||||
|
|
||||||
bAudioPlaying = audio_PlayStream(aAudioName, maxVolume, NULL, NULL) ? true : false;
|
|
||||||
ASSERT(bAudioPlaying == true, "seq_StartFullScreenVideo: unable to initialise sound %s", aAudioName);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL seq_UpdateFullScreenVideo(int *pbClear)
|
BOOL seq_UpdateFullScreenVideo(int *pbClear)
|
||||||
{
|
{
|
||||||
SDWORD i, x, y;
|
SDWORD i, x, y, w = 640, h = 480;
|
||||||
int w=640,h=480;
|
|
||||||
SDWORD frame = 0;
|
|
||||||
UDWORD subMin, subMax;
|
UDWORD subMin, subMax;
|
||||||
UDWORD realFrame;
|
UDWORD realFrame;
|
||||||
BOOL stillText = 0;
|
|
||||||
BOOL bMoreThanOneSequenceLine = false;
|
BOOL bMoreThanOneSequenceLine = false;
|
||||||
BOOL stillPlaying = true;
|
BOOL stillText;
|
||||||
// char scrnFcount[20];
|
|
||||||
|
|
||||||
frame = 0;
|
x = (pie_GetVideoBufferWidth() - w)/2;
|
||||||
stillText = 0;
|
y = (pie_GetVideoBufferHeight() - h)/2;
|
||||||
h = 480;
|
|
||||||
w = 640;
|
|
||||||
|
|
||||||
x = (pie_GetVideoBufferWidth() )/2; //-w )
|
|
||||||
y = (pie_GetVideoBufferHeight())/2; // -h)
|
|
||||||
|
|
||||||
subMin = SUBTITLE_BOX_MAX + D_H;
|
subMin = SUBTITLE_BOX_MAX + D_H;
|
||||||
subMax = SUBTITLE_BOX_MIN + D_H;
|
subMax = SUBTITLE_BOX_MIN + D_H;
|
||||||
|
|
||||||
// stillText = false;
|
stillText = false;
|
||||||
//get any text lines over bottom of the video
|
//get any text lines over bottom of the video
|
||||||
realFrame = OGG_GetFrameCounter();//textFrame + 1;
|
realFrame = (SDL_GetTicks()-time_started)/40; // standard frame is 40 msec
|
||||||
// sprintf(scrnFcount,"%05d",realFrame);
|
|
||||||
// iV_SetTextColour(WZCOL_RED);
|
|
||||||
// iV_DrawText(scrnFcount,140.0,50.0);
|
|
||||||
// printf("realFrame=%d\n",realFrame);
|
|
||||||
for(i=0;i<MAX_TEXT_OVERLAYS;i++)
|
for(i=0;i<MAX_TEXT_OVERLAYS;i++)
|
||||||
{
|
{
|
||||||
if (aSeqList[currentPlaySeq].aText[i].pText[0] != '\0')
|
if (aSeqList[currentPlaySeq].aText[i].pText[0] != '\0')
|
||||||
{
|
{
|
||||||
if (aSeqList[currentPlaySeq].aText[i].bSubtitle == true)
|
if (aSeqList[currentPlaySeq].aText[i].bSubtitle == true)
|
||||||
{
|
{
|
||||||
|
if(realFrame <= aSeqList[currentPlaySeq].aText[i].endFrame)
|
||||||
|
{
|
||||||
|
stillText = true;
|
||||||
|
}
|
||||||
if ((realFrame >= aSeqList[currentPlaySeq].aText[i].startFrame) && (realFrame <= aSeqList[currentPlaySeq].aText[i].endFrame))
|
if ((realFrame >= aSeqList[currentPlaySeq].aText[i].startFrame) && (realFrame <= aSeqList[currentPlaySeq].aText[i].endFrame))
|
||||||
{
|
{
|
||||||
if (subMin > aSeqList[currentPlaySeq].aText[i].y)
|
if (subMin > aSeqList[currentPlaySeq].aText[i].y)
|
||||||
|
|
@ -446,15 +252,8 @@ BOOL seq_UpdateFullScreenVideo(int *pbClear)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((realFrame >= aSeqList[currentPlaySeq].aText[i].endFrame) && (realFrame < (aSeqList[currentPlaySeq].aText[i].endFrame + frameSkip)))
|
|
||||||
{
|
|
||||||
if (pbClear != NULL)
|
|
||||||
{
|
|
||||||
*pbClear = CLEAR_BLACK;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
subMin -= D_H;//adjust video window here because text is already ofset for big screens
|
subMin -= D_H;//adjust video window here because text is already ofset for big screens
|
||||||
subMax -= D_H;
|
subMax -= D_H;
|
||||||
|
|
@ -474,13 +273,12 @@ BOOL seq_UpdateFullScreenVideo(int *pbClear)
|
||||||
}
|
}
|
||||||
|
|
||||||
//call sequence player to download last frame
|
//call sequence player to download last frame
|
||||||
// if(seq_Playing())
|
if(seq_Playing())
|
||||||
{
|
{
|
||||||
|
seq_Update();
|
||||||
|
}
|
||||||
|
|
||||||
stillPlaying = seq_UpdateOgg();
|
|
||||||
//print any text over the video
|
//print any text over the video
|
||||||
realFrame = OGG_GetFrameCounter();//textFrame + 1;
|
|
||||||
// printf("realFrame2=%d\n",realFrame);
|
|
||||||
for(i=0;i<MAX_TEXT_OVERLAYS;i++)
|
for(i=0;i<MAX_TEXT_OVERLAYS;i++)
|
||||||
{
|
{
|
||||||
if (aSeqList[currentPlaySeq].aText[i].pText[0] != '\0')
|
if (aSeqList[currentPlaySeq].aText[i].pText[0] != '\0')
|
||||||
|
|
@ -491,7 +289,6 @@ BOOL seq_UpdateFullScreenVideo(int *pbClear)
|
||||||
{
|
{
|
||||||
aSeqList[currentPlaySeq].aText[i].x = 20 + D_W;
|
aSeqList[currentPlaySeq].aText[i].x = 20 + D_W;
|
||||||
}
|
}
|
||||||
// printf("a] showing %s\n",&(aSeqList[currentPlaySeq].aText[i].pText[0]));
|
|
||||||
iV_DrawText(&(aSeqList[currentPlaySeq].aText[i].pText[0]),
|
iV_DrawText(&(aSeqList[currentPlaySeq].aText[i].pText[0]),
|
||||||
aSeqList[currentPlaySeq].aText[i].x, aSeqList[currentPlaySeq].aText[i].y);
|
aSeqList[currentPlaySeq].aText[i].x, aSeqList[currentPlaySeq].aText[i].y);
|
||||||
}
|
}
|
||||||
|
|
@ -501,23 +298,21 @@ BOOL seq_UpdateFullScreenVideo(int *pbClear)
|
||||||
{
|
{
|
||||||
aSeqList[currentPlaySeq].aText[i].x = 20 + D_W;
|
aSeqList[currentPlaySeq].aText[i].x = 20 + D_W;
|
||||||
}
|
}
|
||||||
// printf("b] showing %s\n",&(aSeqList[currentPlaySeq].aText[i].pText[0]));
|
|
||||||
iV_DrawText(&(aSeqList[currentPlaySeq].aText[i].pText[0]),
|
iV_DrawText(&(aSeqList[currentPlaySeq].aText[i].pText[0]),
|
||||||
aSeqList[currentPlaySeq].aText[i].x, aSeqList[currentPlaySeq].aText[i].y);
|
aSeqList[currentPlaySeq].aText[i].x, aSeqList[currentPlaySeq].aText[i].y);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((!stillPlaying) || (bHoldSeqForAudio))
|
|
||||||
|
if ((!seq_Playing() && !stillText) || (bHoldSeqForAudio))
|
||||||
{
|
{
|
||||||
if (bAudioPlaying)
|
if (bAudioPlaying)
|
||||||
{
|
{
|
||||||
if (aSeqList[currentPlaySeq].bSeqLoop)
|
if (aSeqList[currentPlaySeq].bSeqLoop)
|
||||||
{
|
{
|
||||||
|
seq_Shutdown();
|
||||||
seq_ShutdownOgg();
|
if (!seq_Play(aVideoName))
|
||||||
|
|
||||||
if (!seq_PlayOgg(aVideoName))
|
|
||||||
{
|
{
|
||||||
bHoldSeqForAudio = true;
|
bHoldSeqForAudio = true;
|
||||||
}
|
}
|
||||||
|
|
@ -533,8 +328,6 @@ BOOL seq_UpdateFullScreenVideo(int *pbClear)
|
||||||
return false;//should terminate the video
|
return false;//should terminate the video
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -546,8 +339,7 @@ BOOL seq_StopFullScreenVideo(void)
|
||||||
loop_ClearVideoPlaybackMode();
|
loop_ClearVideoPlaybackMode();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
seq_Shutdown();
|
||||||
seq_ShutdownOgg();
|
|
||||||
|
|
||||||
if (!seq_AnySeqLeft())
|
if (!seq_AnySeqLeft())
|
||||||
{
|
{
|
||||||
|
|
@ -574,7 +366,6 @@ BOOL seq_AddTextForVideo(const char* pText, SDWORD xOffset, SDWORD yOffset, SDWO
|
||||||
SDWORD justification;
|
SDWORD justification;
|
||||||
static SDWORD lastX;
|
static SDWORD lastX;
|
||||||
|
|
||||||
// printf("[seq_AddTextForVideo]%s, start= %d end=%d\n",pText,startFrame,endFrame);
|
|
||||||
iV_SetFont(font_regular);
|
iV_SetFont(font_regular);
|
||||||
|
|
||||||
ASSERT( aSeqList[currentSeq].currentText < MAX_TEXT_OVERLAYS,
|
ASSERT( aSeqList[currentSeq].currentText < MAX_TEXT_OVERLAYS,
|
||||||
|
|
@ -669,7 +460,7 @@ BOOL seq_AddTextForVideo(const char* pText, SDWORD xOffset, SDWORD yOffset, SDWO
|
||||||
BOOL seq_ClearTextForVideo(void)
|
BOOL seq_ClearTextForVideo(void)
|
||||||
{
|
{
|
||||||
SDWORD i, j;
|
SDWORD i, j;
|
||||||
// printf("[seq_ClearTextForVideo]\n");
|
|
||||||
for (j=0; j < MAX_SEQ_LIST; j++)
|
for (j=0; j < MAX_SEQ_LIST; j++)
|
||||||
{
|
{
|
||||||
for(i=0;i<MAX_TEXT_OVERLAYS;i++)
|
for(i=0;i<MAX_TEXT_OVERLAYS;i++)
|
||||||
|
|
@ -696,8 +487,6 @@ static BOOL seq_AddTextFromFile(const char *pTextName, BOOL bJustify)
|
||||||
|
|
||||||
ssprintf(aTextName, "sequenceaudio/%s", pTextName);
|
ssprintf(aTextName, "sequenceaudio/%s", pTextName);
|
||||||
|
|
||||||
// printf("[seq_AddTextFromFile]%s\n",pTextName);
|
|
||||||
|
|
||||||
if (loadFileToBufferNoError(aTextName, fileLoadBuffer, FILE_LOAD_BUFFER_SIZE, &fileSize) == false) //Did I mention this is lame? -Q
|
if (loadFileToBufferNoError(aTextName, fileLoadBuffer, FILE_LOAD_BUFFER_SIZE, &fileSize) == false) //Did I mention this is lame? -Q
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -736,7 +525,7 @@ static BOOL seq_AddTextFromFile(const char *pTextName, BOOL bJustify)
|
||||||
void seq_ClearSeqList(void)
|
void seq_ClearSeqList(void)
|
||||||
{
|
{
|
||||||
SDWORD i;
|
SDWORD i;
|
||||||
// printf("[seq_ClearSeqList]\n");
|
|
||||||
seq_ClearTextForVideo();
|
seq_ClearTextForVideo();
|
||||||
for(i=0;i<MAX_SEQ_LIST;i++)
|
for(i=0;i<MAX_SEQ_LIST;i++)
|
||||||
{
|
{
|
||||||
|
|
@ -752,7 +541,7 @@ void seq_AddSeqToList(const char *pSeqName, const char *pAudioName, const char *
|
||||||
SDWORD strLen;
|
SDWORD strLen;
|
||||||
currentSeq++;
|
currentSeq++;
|
||||||
|
|
||||||
// printf("[seq_AddSeqToList]\n");
|
|
||||||
if ((currentSeq) >= MAX_SEQ_LIST)
|
if ((currentSeq) >= MAX_SEQ_LIST)
|
||||||
{
|
{
|
||||||
ASSERT( false, "seq_AddSeqToList: too many sequences" );
|
ASSERT( false, "seq_AddSeqToList: too many sequences" );
|
||||||
|
|
@ -812,7 +601,7 @@ static void seqDispCDOK( void )
|
||||||
{
|
{
|
||||||
screen_StopBackDrop();
|
screen_StopBackDrop();
|
||||||
}
|
}
|
||||||
// printf("[seqDispCDOK] currentPlaySeq = %d \n",currentPlaySeq);
|
|
||||||
currentPlaySeq++;
|
currentPlaySeq++;
|
||||||
if (currentPlaySeq >= MAX_SEQ_LIST)
|
if (currentPlaySeq >= MAX_SEQ_LIST)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
*/
|
*/
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
//buffer render
|
//buffer render
|
||||||
extern BOOL seq_RenderVideoToBuffer(const char* sequenceName, int seqCommand);
|
extern BOOL seq_RenderVideoToBuffer(iSurface *pSurface, const char* sequenceName, int time, int seqCommand);
|
||||||
|
|
||||||
extern BOOL seq_UpdateFullScreenVideo(int *bClear);
|
extern BOOL seq_UpdateFullScreenVideo(int *bClear);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,4 @@ Global
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
AMDCaProjectFile = G:\dev-warzone-trunk\win32\CodeAnalyst\Warzone2100.caw
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
|
||||||
|
|
@ -41,13 +41,13 @@
|
||||||
Name="FlexGenerator"
|
Name="FlexGenerator"
|
||||||
OutputFile="$(ProjectDir)..\src\$(InputName).lex.c"
|
OutputFile="$(ProjectDir)..\src\$(InputName).lex.c"
|
||||||
/>
|
/>
|
||||||
<Tool
|
|
||||||
Name="VCXMLDataGeneratorTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
ExecutionBucket="4"
|
ExecutionBucket="4"
|
||||||
/>
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCXMLDataGeneratorTool"
|
||||||
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
/>
|
/>
|
||||||
|
|
@ -79,7 +79,7 @@
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
ExecutionBucket="11"
|
ExecutionBucket="11"
|
||||||
AdditionalDependencies="SDL.lib SDLmain.lib SDL_net-static.lib libpng-static.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib OpenAL32.lib glc32.lib OpenGL32.lib GLU32.lib shfolder.lib winmm.lib wsock32.lib dbghelp.lib libpopt.lib physfs.lib zlib.lib G:\theora\win32\VS2005\release\libtheora.lib"
|
AdditionalDependencies="SDL.lib SDLmain.lib SDL_net-static.lib libpng-static.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib OpenAL32.lib glc32.lib OpenGL32.lib GLU32.lib shfolder.lib winmm.lib wsock32.lib dbghelp.lib libpopt.lib physfs.lib zlib.lib"
|
||||||
OutputFile="$(OutDir)\$(ProjectName)-Dbg.exe"
|
OutputFile="$(OutDir)\$(ProjectName)-Dbg.exe"
|
||||||
LinkIncremental="2"
|
LinkIncremental="2"
|
||||||
AdditionalLibraryDirectories=""$(SolutionDir)\..\devpkg\lib""
|
AdditionalLibraryDirectories=""$(SolutionDir)\..\devpkg\lib""
|
||||||
|
|
@ -117,9 +117,6 @@
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCAppVerifierTool"
|
Name="VCAppVerifierTool"
|
||||||
/>
|
/>
|
||||||
<Tool
|
|
||||||
Name="VCWebDeploymentTool"
|
|
||||||
/>
|
|
||||||
</Configuration>
|
</Configuration>
|
||||||
<Configuration
|
<Configuration
|
||||||
Name="Release|Win32"
|
Name="Release|Win32"
|
||||||
|
|
@ -144,13 +141,13 @@
|
||||||
Name="FlexGenerator"
|
Name="FlexGenerator"
|
||||||
OutputFile="$(ProjectDir)..\src\$(InputName).lex.c"
|
OutputFile="$(ProjectDir)..\src\$(InputName).lex.c"
|
||||||
/>
|
/>
|
||||||
<Tool
|
|
||||||
Name="VCXMLDataGeneratorTool"
|
|
||||||
/>
|
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCCustomBuildTool"
|
||||||
ExecutionBucket="4"
|
ExecutionBucket="4"
|
||||||
/>
|
/>
|
||||||
|
<Tool
|
||||||
|
Name="VCXMLDataGeneratorTool"
|
||||||
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
/>
|
/>
|
||||||
|
|
@ -218,9 +215,6 @@
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCAppVerifierTool"
|
Name="VCAppVerifierTool"
|
||||||
/>
|
/>
|
||||||
<Tool
|
|
||||||
Name="VCWebDeploymentTool"
|
|
||||||
/>
|
|
||||||
</Configuration>
|
</Configuration>
|
||||||
</Configurations>
|
</Configurations>
|
||||||
<References>
|
<References>
|
||||||
|
|
@ -973,6 +967,10 @@
|
||||||
RelativePath="..\src\message.h"
|
RelativePath="..\src\message.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\src\messagely.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\message_parser.tab.h"
|
RelativePath="..\src\message_parser.tab.h"
|
||||||
>
|
>
|
||||||
|
|
@ -981,10 +979,6 @@
|
||||||
RelativePath="..\src\messagedef.h"
|
RelativePath="..\src\messagedef.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\src\messagely.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\miscimd.h"
|
RelativePath="..\src\miscimd.h"
|
||||||
>
|
>
|
||||||
|
|
@ -1070,11 +1064,11 @@
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\src\parsetest.h"
|
RelativePath="..\lib\framework\platform.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\lib\framework\platform.h"
|
RelativePath="..\src\parsetest.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue