aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Lua/AUTHORS.txt1
-rw-r--r--Lua/COPYRIGHT.txt1
-rw-r--r--Lua/src/base/USingScores.pas2
-rw-r--r--Lua/src/base/USong.pas4
-rw-r--r--Lua/src/lib/ffmpeg/avcodec.pas23
-rw-r--r--Lua/src/lib/ffmpeg/avformat.pas31
-rw-r--r--Lua/src/lib/ffmpeg/avio.pas2
-rw-r--r--Lua/src/lib/ffmpeg/avutil.pas6
-rw-r--r--Lua/src/lib/ffmpeg/mathematics.pas5
-rw-r--r--Lua/src/lib/ffmpeg/opt.pas7
-rw-r--r--Lua/src/screens/UScreenEditSub.pas2
-rw-r--r--Lua/src/screens/UScreenSong.pas4
12 files changed, 62 insertions, 26 deletions
diff --git a/Lua/AUTHORS.txt b/Lua/AUTHORS.txt
index 3f9a0f63..21f2c27a 100644
--- a/Lua/AUTHORS.txt
+++ b/Lua/AUTHORS.txt
@@ -8,6 +8,7 @@ This modification was continued at Sourceforge.net by the Ultrastar Deluxe Team:
Mischi
Mog
Whiteshark
+ brunzel
~=[ Retired project developers / admins ]=~
Alex
diff --git a/Lua/COPYRIGHT.txt b/Lua/COPYRIGHT.txt
index cbc9105d..f2a8e249 100644
--- a/Lua/COPYRIGHT.txt
+++ b/Lua/COPYRIGHT.txt
@@ -6,6 +6,7 @@ list. Contact us (see: AUTHORS) and we'll add you.
Jay Binks "jaybinks"
Dirk Dunger "blindy"
+Alexander Eckart "brunzel"
"eddie-0815"
Mike Gränz "mog"
Tobias Gunkel "tobigun"
diff --git a/Lua/src/base/USingScores.pas b/Lua/src/base/USingScores.pas
index 56301539..6fdfaeb6 100644
--- a/Lua/src/base/USingScores.pas
+++ b/Lua/src/base/USingScores.pas
@@ -750,7 +750,7 @@ procedure TSingScores.DoRaiseScore(const Index: integer);
const
RaisePerSecond = 500;
begin
- S := (Players[Index].Score - Players[Index].ScoreDisplayed) + GetPopUpPoints(Index);
+ S := (Players[Index].Score - (Players[Index].ScoreDisplayed + GetPopUpPoints(Index)));
if (S <> 0) then
begin
diff --git a/Lua/src/base/USong.pas b/Lua/src/base/USong.pas
index fccf2757..705206c4 100644
--- a/Lua/src/base/USong.pas
+++ b/Lua/src/base/USong.pas
@@ -510,7 +510,9 @@ begin
//Check for ZeroNote
if Param2 = 0 then
- Log.LogError('Found zero-length note at "'+Param0+' '+IntToStr(Param1)+' '+IntToStr(Param2)+' '+IntToStr(Param3)+ParamLyric+'" -> Note ignored!')
+ Log.LogWarn(Format('"%s" in line %d: %s',
+ [FileNamePath.ToNative, FileLineNo, 'found note with length zero -> note ignored']), 'TSong.LoadSong')
+ //Log.LogError('Found zero-length note at "'+Param0+' '+IntToStr(Param1)+' '+IntToStr(Param2)+' '+IntToStr(Param3)+ParamLyric+'" -> Note ignored!')
else
begin
// add notes
diff --git a/Lua/src/lib/ffmpeg/avcodec.pas b/Lua/src/lib/ffmpeg/avcodec.pas
index d0400d9a..3cbfc0df 100644
--- a/Lua/src/lib/ffmpeg/avcodec.pas
+++ b/Lua/src/lib/ffmpeg/avcodec.pas
@@ -31,7 +31,7 @@
*)
{
* update to
- * Max. version: 52.42.0, Sun Dec 6 19:20:00 2009 CET
+ * Max. version: 52.45.0, Tue Dec 29 00:25:00 2009 CET
* MiSchi
}
@@ -65,7 +65,7 @@ uses
const
(* Max. supported version by this header *)
LIBAVCODEC_MAX_VERSION_MAJOR = 52;
- LIBAVCODEC_MAX_VERSION_MINOR = 42;
+ LIBAVCODEC_MAX_VERSION_MINOR = 45;
LIBAVCODEC_MAX_VERSION_RELEASE = 0;
LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -266,6 +266,10 @@ type
{$IF LIBAVCODEC_VERSION >= 52041000} // >= 52.41.0
CODEC_ID_FLASHSV2,
{$IFEND}
+{$IF LIBAVCODEC_VERSION >= 52043000} // >= 52.43.0
+ CODEC_ID_CDGRAPHICS,
+ CODEC_ID_R210,
+{$IFEND}
//* various PCM "codecs" */
CODEC_ID_PCM_S16LE= $10000,
@@ -488,7 +492,7 @@ const
* to be the native codec channel order.
*}
{$IF LIBAVCODEC_VERSION >= 52038001} // >= 52.38.1
- CH_LAYOUT_NATIVE = $8000000000000000LL
+ CH_LAYOUT_NATIVE = $8000000000000000;
{$IFEND}
{* Audio channel convenience macros *}
CH_LAYOUT_MONO = (CH_FRONT_CENTER);
@@ -703,6 +707,9 @@ const
CODEC_FLAG2_CHUNKS = $00008000; ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
CODEC_FLAG2_NON_LINEAR_QUANT = $00010000; ///< Use MPEG-2 nonlinear quantizer.
CODEC_FLAG2_BIT_RESERVOIR = $00020000; ///< Use a bit reservoir when encoding if possible
+ {$IF LIBAVCODEC_VERSION >= 52043000} // >= 52.43.0
+ CODEC_FLAG2_MBTREE = $00040000; ///< Use macroblock tree ratecontrol (x264 only)
+ {$IFEND}
(* Unsupported options :
* Syntax Arithmetic coding (SAC)
@@ -1113,7 +1120,11 @@ type
TQuadIntArray = array[0..3] of cint;
// int (*func)(struct AVCodecContext *c2, void *arg)
TExecuteFunc = function(c2: PAVCodecContext; arg: Pointer): cint; cdecl;
-
+{$IF LIBAVCODEC_VERSION >= 52037000} // >= 52.37.0
+ // int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr)
+ TExecute2Func = function(c2: PAVCodecContext; arg: Pointer; jobnr: cint; threadnr: cint): cint; cdecl;
+{$IFEND}
+
TAVClass = record
class_name: PAnsiChar;
(* actually passing a pointer to an AVCodecContext
@@ -2806,7 +2817,7 @@ type
* - encoding: Set by libavcodec, user can override.
* - decoding: Set by libavcodec, user can override.
*)
- execute2: function (c: PAVCodecContext; func: function (c2: PAVCodecContext; arg: Pointer; jobnr: cint; threadnr: cint): cint; cdecl; arg2: Pointer; ret: Pcint; count: cint): cint; cdecl;
+ execute2: function (c: PAVCodecContext; func: TExecute2Func; arg2: Pointer; ret: Pcint; count: cint): cint; cdecl;
{$IFEND}
{$IF LIBAVCODEC_VERSION >= 52042000} // >= 52.42.0
(**
@@ -3727,7 +3738,7 @@ function avcodec_decode_audio2(avctx: PAVCodecContext; samples: PSmallint;
* (AltiVec and SSE do).
*
* @note Some codecs have a delay between input and output, these need to be
- * feeded with avpkt->data=NULL, avpkt->size=0 at the end to return the remaining frames.
+ * fed with avpkt->data=NULL, avpkt->size=0 at the end to return the remaining frames.
*
* @param avctx the codec context
* @param[out] samples the output buffer
diff --git a/Lua/src/lib/ffmpeg/avformat.pas b/Lua/src/lib/ffmpeg/avformat.pas
index 2b8a5e4f..81018333 100644
--- a/Lua/src/lib/ffmpeg/avformat.pas
+++ b/Lua/src/lib/ffmpeg/avformat.pas
@@ -31,7 +31,7 @@
*)
{
* update to
- * Max. version: 52.41.0, Sun Dec 6 20:15:00 2009 CET
+ * Max. version: 52.44.0, Tue Dec 29 0:40:00 2009 CET
* MiSchi
}
@@ -65,7 +65,7 @@ uses
const
(* Max. supported version by this header *)
LIBAVFORMAT_MAX_VERSION_MAJOR = 52;
- LIBAVFORMAT_MAX_VERSION_MINOR = 41;
+ LIBAVFORMAT_MAX_VERSION_MINOR = 44;
LIBAVFORMAT_MAX_VERSION_RELEASE = 0;
LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -136,6 +136,10 @@ type
const
AV_METADATA_MATCH_CASE = 1;
AV_METADATA_IGNORE_SUFFIX = 2;
+{$IF LIBAVFORMAT_VERSION >= 52043000} // >= 52.43.0
+ AV_METADATA_DONT_STRDUP_KEY = 4;
+ AV_METADATA_DONT_STRDUP_VAL = 8;
+{$IFEND}
type
PAVMetadataTag = ^TAVMetadataTag;
@@ -147,6 +151,7 @@ type
PAVMetadata = Pointer;
{$IF LIBAVFORMAT_VERSION > 52024001} // > 52.24.1
+{$IF LIBAVFORMAT_VERSION_MAJOR = 52}
(**
* Gets a metadata element with matching key.
* @param prev Set to the previous matching element to find the next.
@@ -165,6 +170,18 @@ function av_metadata_get(m: PAVMetadata; key: {const} PAnsiChar;
*)
function av_metadata_set(var pm: PAVMetadata; key: {const} PAnsiChar; value: {const} PAnsiChar): cint;
cdecl; external av__format;
+{$IFEND}
+
+{$IF LIBAVFORMAT_VERSION >= 52043000} // >= 52.43.0
+(**
+ * Sets the given tag in m, overwriting an existing tag.
+ * @param key tag key to add to m (will be av_strduped depending on flags)
+ * @param value tag value to add to m (will be av_strduped depending on flags)
+ * @return >= 0 on success otherwise an error code <0
+ *)
+function av_metadata_set2(var pm: PAVMetadata; key: {const} PAnsiChar; value: {const} PAnsiChar; flags: cint): cint;
+ cdecl; external av__format;
+{$IFEND}
(**
* Frees all the memory allocated for an AVMetadata struct.
@@ -371,9 +388,9 @@ const
{$IF LIBAVFORMAT_VERSION >= 52035000} // >= 52.35.0
{$IF LIBAVFORMAT_VERSION < 52039000} // < 52.39.0
- RAW_PACKET_BUFFER_SIZE 32000
+ RAW_PACKET_BUFFER_SIZE = 32000;
{$ELSE}
- RAW_PACKET_BUFFER_SIZE 2500000
+ RAW_PACKET_BUFFER_SIZE = 2500000;
{$IFEND}
{$IFEND}
@@ -764,6 +781,12 @@ type
*)
last_in_packet_buffer: PAVPacketList;
{$IFEND}
+ {$IF LIBAVFORMAT_VERSION >= 52041000} // >= 52.41.0
+ (**
+ * Average framerate
+ *)
+ avg_frame_rate: TAVRational;
+ {$IFEND}
end;
(**
diff --git a/Lua/src/lib/ffmpeg/avio.pas b/Lua/src/lib/ffmpeg/avio.pas
index 73c90b69..faa6c24f 100644
--- a/Lua/src/lib/ffmpeg/avio.pas
+++ b/Lua/src/lib/ffmpeg/avio.pas
@@ -37,7 +37,7 @@
{
* update to
- * Max. avformat version: 52.41.0, Sun Dec 6 20:15:00 2009 CET
+ * Max. avformat version: 52.44.0, Tue Dec 29 0:40:00 2009 CET
* MiSchi
}
diff --git a/Lua/src/lib/ffmpeg/avutil.pas b/Lua/src/lib/ffmpeg/avutil.pas
index 55bab601..c0428bef 100644
--- a/Lua/src/lib/ffmpeg/avutil.pas
+++ b/Lua/src/lib/ffmpeg/avutil.pas
@@ -39,7 +39,7 @@
*)
{
Update changes auf avutil.h, mem.h and log.h
- Max. version 50.05.1, Sun, Dec 6 24:00:00 2009 UTC
+ Max. version 50.7.0, Tue, Dec 29 0:30:00 2009 UTC
include/keep pixfmt.h (change in revision 50.01.0)
Maybe, the pixelformats are not needed, but it has not been checked.
log.h is only partial.
@@ -70,8 +70,8 @@ uses
const
(* Max. supported version by this header *)
LIBAVUTIL_MAX_VERSION_MAJOR = 50;
- LIBAVUTIL_MAX_VERSION_MINOR = 5;
- LIBAVUTIL_MAX_VERSION_RELEASE = 1;
+ LIBAVUTIL_MAX_VERSION_MINOR = 7;
+ LIBAVUTIL_MAX_VERSION_RELEASE = 0;
LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
(LIBAVUTIL_MAX_VERSION_RELEASE * VERSION_RELEASE);
diff --git a/Lua/src/lib/ffmpeg/mathematics.pas b/Lua/src/lib/ffmpeg/mathematics.pas
index f3a307b6..24c9e186 100644
--- a/Lua/src/lib/ffmpeg/mathematics.pas
+++ b/Lua/src/lib/ffmpeg/mathematics.pas
@@ -75,6 +75,11 @@ type
);
{$IF LIBAVUTIL_VERSION >= 49013000} // 49.13.0
+(**
+ * Returns the greatest common divisor of a and b.
+ * If both a or b are 0 or either or both are <0 then behavior is
+ * undefined.
+ *)
function av_gcd(a: cint64; b: cint64): cint64;
cdecl; external av__util; {av_const}
{$IFEND}
diff --git a/Lua/src/lib/ffmpeg/opt.pas b/Lua/src/lib/ffmpeg/opt.pas
index 65e055ce..86144598 100644
--- a/Lua/src/lib/ffmpeg/opt.pas
+++ b/Lua/src/lib/ffmpeg/opt.pas
@@ -122,13 +122,6 @@ type
* This is identical to AVOption except that default_val was replaced by
* an union, it should be compatible with AVOption on normal platforms.
*)
-const
- AV_OPT_FLAG_ENCODING_PARAM = 1; ///< a generic parameter which can be set by the user for muxing or encoding
- AV_OPT_FLAG_DECODING_PARAM = 2; ///< a generic parameter which can be set by the user for demuxing or decoding
- AV_OPT_FLAG_METADATA = 4; ///< some data extracted or inserted into the file like title, comment, ...
- AV_OPT_FLAG_AUDIO_PARAM = 8;
- AV_OPT_FLAG_VIDEO_PARAM = 16;
- AV_OPT_FLAG_SUBTITLE_PARAM = 32;
type
PAVOption2 = ^TAVOption2;
TAVOption2 = record
diff --git a/Lua/src/screens/UScreenEditSub.pas b/Lua/src/screens/UScreenEditSub.pas
index 609a689b..10584ce8 100644
--- a/Lua/src/screens/UScreenEditSub.pas
+++ b/Lua/src/screens/UScreenEditSub.pas
@@ -934,7 +934,7 @@ begin
begin
Inc(HighNote);
SetLength(Note, HighNote + 1);
- Note[HighNote] := Note[N];
+ Note[HighNote] := Lines[0].Line[CStart].Note[N];
End_ := Note[HighNote].Start + Note[HighNote].Length;
if Note[HighNote].Tone < BaseNote then
diff --git a/Lua/src/screens/UScreenSong.pas b/Lua/src/screens/UScreenSong.pas
index 716f4053..5bc42a68 100644
--- a/Lua/src/screens/UScreenSong.pas
+++ b/Lua/src/screens/UScreenSong.pas
@@ -1529,8 +1529,8 @@ end;
procedure TScreenSong.OnHide;
begin
- // if preview is not loaded: load musicfile now
- if (PreviewOpened <> Interaction) then
+ // if preview is not loaded: load musicfile now; not on cat-main!
+ if (PreviewOpened <> Interaction) and not CatSongs.Song[Interaction].main then
AudioPlayback.Open(CatSongs.Song[Interaction].Path.Append(CatSongs.Song[Interaction].Mp3));
// turn music volume to 100%
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 07:57:05 +0000