aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Classes/UVideo.pas
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-30 09:31:51 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-30 09:31:51 +0000
commitea92932825739b6d7f5ac1434382a1a59a0371fd (patch)
tree15c0807b5fdbe064a1a9a786a12d308650aeac61 /Game/Code/Classes/UVideo.pas
parentbb4a6304aab5a215055813617130c01d91d80a83 (diff)
downloadusdx-ea92932825739b6d7f5ac1434382a1a59a0371fd.tar.gz
usdx-ea92932825739b6d7f5ac1434382a1a59a0371fd.tar.xz
usdx-ea92932825739b6d7f5ac1434382a1a59a0371fd.zip
- new acinerella.dll (based on 1.4)
- the song does not restart if you change the video gap in the editor while playing - some corrections in Blue Sensation theme; darker sing notes graphics - some bugfixes - max fps at ~200 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2425 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Classes/UVideo.pas')
-rw-r--r--Game/Code/Classes/UVideo.pas12
1 files changed, 4 insertions, 8 deletions
diff --git a/Game/Code/Classes/UVideo.pas b/Game/Code/Classes/UVideo.pas
index 8d56182e..ee3d2bbd 100644
--- a/Game/Code/Classes/UVideo.pas
+++ b/Game/Code/Classes/UVideo.pas
@@ -130,10 +130,7 @@ end;
function seek_proc(sender: Pointer; pos: int64; whence: integer): int64; cdecl;
begin
- if whence in [0, 1, 2] then
- result := fs.Seek(pos, TSeekOrigin(whence))
- else
- result := -1;
+ result := fs.Seek(pos, TSeekOrigin(whence))
end;
procedure Init;
@@ -180,7 +177,7 @@ begin
inst := ac_init();
videodecoder := nil;
- ac_open(inst, nil, nil, @read_proc, @seek_proc, nil);
+ ac_open(inst, nil, nil, @read_proc, @seek_proc, nil, nil);
if not inst^.opened then
begin
@@ -251,12 +248,12 @@ begin
PIXEL_FORMAT, GL_UNSIGNED_BYTE, nil);
glBindTexture(GL_TEXTURE_2D, 0);
- if(pbo_supported) then
+ if(pbo_supported) then
begin
glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo);
glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, numBytes*TexX*TexY, nil, GL_STREAM_DRAW);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
- end;
+ end;
mmfps := 50;
end;
@@ -812,7 +809,6 @@ begin
// upper-right coord
glTexCoord2f(TexRect.Right, TexRect.Upper);
glVertex2f(ScreenRect.Right, ScreenRect.Upper);
-
glEnd;
if Window.windowed then