aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/base/UFont.pas10
-rw-r--r--src/base/UImage.pas1
-rw-r--r--src/base/ULanguage.pas1
-rw-r--r--src/base/UMusic.pas2
-rw-r--r--src/base/UPath.pas2
-rw-r--r--src/base/USong.pas5
-rw-r--r--src/base/USongs.pas3
-rw-r--r--src/base/UTime.pas1
-rw-r--r--src/media/UAudioDecoder_FFmpeg.pas2
-rw-r--r--src/media/UMediaCore_FFmpeg.pas2
-rw-r--r--src/menu/UDisplay.pas1
-rw-r--r--src/menu/UMenu.pas5
-rw-r--r--src/screens/UScreenEditSub.pas8
-rw-r--r--src/screens/UScreenPartyOptions.pas1
-rw-r--r--src/screens/UScreenPartyPlayer.pas9
-rw-r--r--src/screens/UScreenScore.pas3
-rw-r--r--src/screens/UScreenSing.pas3
17 files changed, 20 insertions, 39 deletions
diff --git a/src/base/UFont.pas b/src/base/UFont.pas
index 0249b665..99fae037 100644
--- a/src/base/UFont.pas
+++ b/src/base/UFont.pas
@@ -844,12 +844,6 @@ const
0, 0, 1, 0,
0, 0, 0, 1
);
- cShearMatrixInv: array[0..15] of GLfloat = (
- 1, 0, 0, 0,
- -cShearFactor, 1, 0, 0,
- 0, 0, 1, 0,
- 0, 0, 0, 1
- );
var
LibraryInst: FT_Library;
@@ -2227,7 +2221,6 @@ var
OuterNumPoints, InnerNumPoints, GlyphNumPoints: FT_UInt;
OuterNumContours, InnerNumContours, GlyphNumContours: FT_UInt;
OuterBorder, InnerBorder: FT_StrokerBorder;
- OutlineFlags: FT_Int;
UseStencil: boolean;
begin
// It is possible to extrude the borders of a glyph with FT_Glyph_Stroke
@@ -2311,9 +2304,6 @@ begin
GlyphNumPoints := InnerNumPoints + OuterNumPoints;
GlyphNumContours := InnerNumContours + OuterNumContours;
- // save flags before deletion (TODO: set them on the resulting outline)
- OutlineFlags := Outline.flags;
-
// resize glyph outline to hold inner and outer border
FT_Outline_Done(Glyph.Library_, Outline);
if (FT_Outline_New(Glyph.Library_, GlyphNumPoints, GlyphNumContours, Outline) <> 0) then
diff --git a/src/base/UImage.pas b/src/base/UImage.pas
index 1866316e..55ccb619 100644
--- a/src/base/UImage.pas
+++ b/src/base/UImage.pas
@@ -782,7 +782,6 @@ end;
function LoadImage(const Filename: IPath): PSDL_Surface;
var
FilenameCaseAdj: IPath;
- FileStream: TBinaryFileStream;
SDLStream: PSDL_RWops;
begin
Result := nil;
diff --git a/src/base/ULanguage.pas b/src/base/ULanguage.pas
index 5f8a2692..efa919dd 100644
--- a/src/base/ULanguage.pas
+++ b/src/base/ULanguage.pas
@@ -213,7 +213,6 @@ end;
*}
function TLanguage.Translate(const Text: RawByteString): UTF8String;
var
- E: integer; // entry
ID: AnsiString;
EntryIndex: integer;
begin
diff --git a/src/base/UMusic.pas b/src/base/UMusic.pas
index b7179d8c..d37c4458 100644
--- a/src/base/UMusic.pas
+++ b/src/base/UMusic.pas
@@ -1091,9 +1091,7 @@ end;
function TAudioPlaybackStream.Synchronize(BufferSize: integer; FormatInfo: TAudioFormatInfo): integer;
var
TimeDiff: double;
- FrameDiff: double;
FrameSkip: integer;
- ReqFrames: integer;
MasterClock: real;
CurPosition: real;
const
diff --git a/src/base/UPath.pas b/src/base/UPath.pas
index 4ce76cf0..ba5daf59 100644
--- a/src/base/UPath.pas
+++ b/src/base/UPath.pas
@@ -813,8 +813,10 @@ begin
end;
function TPathImpl.Equals(const Other: IPath; IgnoreCase: boolean): boolean;
+{$IFNDEF UNIX}
var
SelfPath, OtherPath: UTF8String;
+{$ENDIF}
begin
{$IFDEF UNIX}
(*
diff --git a/src/base/USong.pas b/src/base/USong.pas
index a8581ebd..bff39a29 100644
--- a/src/base/USong.pas
+++ b/src/base/USong.pas
@@ -283,8 +283,6 @@ end;
function TSong.FindSongFile(Dir: IPath; Mask: UTF8String): IPath;
var
Iter: IFileIterator;
- FileInfo: TFileInfo;
- FileName: IPath;
begin
Iter := FileSystem.FileFind(Dir.Append(Mask), faDirectory);
if (Iter.HasNext) then
@@ -638,7 +636,6 @@ var
Param3: integer;
ParamS: string;
I, J: integer;
- NoteIndex: integer;
NoteType: char;
SentenceEnd, Rest, Time: integer;
@@ -1264,8 +1261,6 @@ begin
end;
procedure TSong.NewSentence(LineNumberP: integer; Param1, Param2: integer);
-var
- I: integer;
begin
if (Lines[LineNumberP].Line[Lines[LineNumberP].High].HighNote <> -1) then
diff --git a/src/base/USongs.pas b/src/base/USongs.pas
index cfc32a99..25ad4ae3 100644
--- a/src/base/USongs.pas
+++ b/src/base/USongs.pas
@@ -90,7 +90,6 @@ type
TSongs = class(TThread)
{$ENDIF}
private
- fNotify, fWatch: longint;
fParseSongDirectory: boolean;
fProcessing: boolean;
{$ifdef MSWINDOWS}
@@ -207,8 +206,6 @@ begin
end;
procedure TSongs.Execute();
-var
- fChangeNotify: THandle;
begin
{$IFDEF USE_PSEUDO_THREAD}
int_LoadSongList();
diff --git a/src/base/UTime.pas b/src/base/UTime.pas
index 0610ef59..b9ece0bb 100644
--- a/src/base/UTime.pas
+++ b/src/base/UTime.pas
@@ -46,7 +46,6 @@ type
private
AbsoluteTime: int64; // system-clock reference time for calculation of CurrentTime
RelativeTime: real;
- TriggerMode: boolean;
State: TRelativeTimerState;
public
constructor Create();
diff --git a/src/media/UAudioDecoder_FFmpeg.pas b/src/media/UAudioDecoder_FFmpeg.pas
index bc319546..34b8d244 100644
--- a/src/media/UAudioDecoder_FFmpeg.pas
+++ b/src/media/UAudioDecoder_FFmpeg.pas
@@ -277,7 +277,7 @@ end;
function TFFmpegDecodeStream.Open(const Filename: IPath): boolean;
var
SampleFormat: TAudioSampleFormat;
- TestFrame: TAVPacket;
+{ TestFrame: TAVPacket;}
AVResult: integer;
begin
Result := false;
diff --git a/src/media/UMediaCore_FFmpeg.pas b/src/media/UMediaCore_FFmpeg.pas
index 55d9a779..3f6eca5f 100644
--- a/src/media/UMediaCore_FFmpeg.pas
+++ b/src/media/UMediaCore_FFmpeg.pas
@@ -504,9 +504,11 @@ begin
end;
function TMediaCore_FFmpeg.AVFormatOpenInput(ps: PPAVFormatContext; filename: {const} PAnsiChar): Integer;
+{$IF LIBAVFORMAT_VERSION >= 54029104}
var
h: Pointer;
buffer: Pointer;
+{$ENDIF}
begin
{$IF LIBAVFORMAT_VERSION >= 54029104}
ps^ := avformat_alloc_context();
diff --git a/src/menu/UDisplay.pas b/src/menu/UDisplay.pas
index 6ec8e2ed..6191fb68 100644
--- a/src/menu/UDisplay.pas
+++ b/src/menu/UDisplay.pas
@@ -216,7 +216,6 @@ var
FadeStateSquare: real;
FadeW, FadeH: real;
FadeCopyW, FadeCopyH: integer;
- currentTime: cardinal;
glError: glEnum;
begin
diff --git a/src/menu/UMenu.pas b/src/menu/UMenu.pas
index b011eddf..756ef237 100644
--- a/src/menu/UMenu.pas
+++ b/src/menu/UMenu.pas
@@ -1315,7 +1315,6 @@ function TMenu.AddSelectSlide(X, Y, W, H, SkipX, SBGW, ColR, ColG, ColB, Int, DC
const Caption: UTF8String; var Data: integer): integer;
var
S: integer;
- I: integer;
begin
S := Length(SelectsS);
SetLength(SelectsS, S + 1);
@@ -1750,7 +1749,7 @@ end;
//of the control at this position
function TMenu.InteractAt(X, Y: real): integer;
var
- i, nBut: integer;
+ i: integer;
begin
Result := -1;
for i := Low(Interactions) to High(Interactions) do
@@ -1782,7 +1781,7 @@ end;
//takes x,y coordinates and returns the button collection id
function TMenu.CollectionAt(X, Y: real): integer;
var
- i, nBut: integer;
+ i: integer;
begin
Result := -1;
for i:= Low(ButtonCollection) to High(ButtonCollection) do
diff --git a/src/screens/UScreenEditSub.pas b/src/screens/UScreenEditSub.pas
index fb3f04ce..b2b29860 100644
--- a/src/screens/UScreenEditSub.pas
+++ b/src/screens/UScreenEditSub.pas
@@ -83,13 +83,15 @@ type
{$IFDEF UseMIDIPort}
MidiOut: TMidiOutput;
- {$endif}
+ {$ENDIF}
MidiStart: real;
MidiStop: real;
MidiTime: real;
MidiPos: real;
+ {$IFDEF UseMIDIPort}
MidiLastNote: integer;
+ {$ENDIF}
TextEditMode: boolean;
editText: UTF8String; //backup of current text in text-edit-mode
@@ -1428,8 +1430,8 @@ var
pos: real;
br: real;
- line, note: integer;
- numLines, numNotes: integer;
+ line: integer;
+ numLines: integer;
begin
numLines := Length(Lines[0].Line);
diff --git a/src/screens/UScreenPartyOptions.pas b/src/screens/UScreenPartyOptions.pas
index f63b37fb..768947bf 100644
--- a/src/screens/UScreenPartyOptions.pas
+++ b/src/screens/UScreenPartyOptions.pas
@@ -48,7 +48,6 @@ type
SelectLevel: cardinal;
SelectPlayList: cardinal;
SelectPlayList2: cardinal;
- SelectRounds: cardinal;
IPlaylist: array[0..2] of UTF8String;
IPlaylist2: array of UTF8String;
diff --git a/src/screens/UScreenPartyPlayer.pas b/src/screens/UScreenPartyPlayer.pas
index a7f4d627..0e1bcf5c 100644
--- a/src/screens/UScreenPartyPlayer.pas
+++ b/src/screens/UScreenPartyPlayer.pas
@@ -439,11 +439,16 @@ begin
end;
procedure TScreenPartyPlayer.SetAnimationProgress(Progress: real);
+{
var
I: integer;
+}
begin
- {for I := 0 to high(Button) do
- Button[I].Texture.ScaleW := Progress; }
+{
+ for I := 0 to high(Button) do
+ Button[I].Texture.ScaleW := Progress;
+}
end;
+
end.
diff --git a/src/screens/UScreenScore.pas b/src/screens/UScreenScore.pas
index 82b73ea2..4fdaf0f1 100644
--- a/src/screens/UScreenScore.pas
+++ b/src/screens/UScreenScore.pas
@@ -159,9 +159,6 @@ type
{ statics with players ids }
StaticPlayerIdBox: array[1..6] of integer;
- TexturePlayerIdBox: array[1..6] of TTexture;
-
- Animation: real;
TextScore_ActualValue: array[1..6] of integer;
TextPhrase_ActualValue: array[1..6] of integer;
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas
index e69e3f56..50d2d6dd 100644
--- a/src/screens/UScreenSing.pas
+++ b/src/screens/UScreenSing.pas
@@ -84,7 +84,7 @@ type
fMusicSync: TMusicSyncSource;
fTimebarMode: TTimebarMode;
- StartNote, EndNote: TPos;
+ StartNote: TPos;
procedure LoadNextSong();
procedure UpdateMedleyStats(medley_end: boolean);
@@ -983,7 +983,6 @@ var
DisplayPrefix: string;
DisplayMin: integer;
DisplaySec: integer;
- T: integer;
CurLyricsTime: real;
TotalTime: real;
VideoFrameTime: extended;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-05 03:18:26 +0000