v1.01 rev3936 (16 Nov 2019)

- Added support for Starblade Alpha videos Bug fixes: - Replacing audio throws an exception
m35 · Nov 17, 2019 · 2f042c9 · 2f042c9
1 parent 2733746
commit 2f042c9
Show file tree

Hide file tree

Showing 63 changed files with 1,188 additions and 145 deletions.
diff --git a/jpsxdec/PSXListOFGames.txt b/jpsxdec/PSXListOFGames.txt
@@ -1069,7 +1069,7 @@ Status
 [ ]  SCUS-94278  Official U.S. PlayStation Magazine 16 [Demo]
 [ ]  SCUS-94279  Official U.S. PlayStation Magazine 17 [Demo]
 [ ]  SCUS-94280  Official U.S. PlayStation Magazine 18 [Demo]
-[ ]  SCUS-94281  Official U.S. PlayStation Magazine 19 [Demo]
+[!]  SCUS-94281  Official U.S. PlayStation Magazine 19 [Demo]
 [ ]  SCUS-94282  Official U.S. PlayStation Magazine 20 - May '99 [Demo]
 [ ]  SCUS-94429  Official U.S. PlayStation Magazine 21 [Demo]
 [ ]  SCUS-94430  Official U.S. PlayStation Magazine 22 [Demo]
@@ -1155,8 +1155,7 @@ Status
 [ ]  SCUS-94483  PlayStation [Demo]
 [ ]  SCUS-94799  PlayStation 2001 [Demo]
 [ ]  SCUS-94960  PlayStation Picks (Green) [Demo]
-[ ]  SCUS-94952  PlayStation Picks (Purple) [Demo]
-[ ]  SCUS-94952  PlayStation Picks (Purple) [Demo] (SCUS-94952)
+[f]  SCUS-94952  PlayStation Picks (Purple) [Demo]
 [ ]  SCUS-94259  PlayStation Underground 2.2 [Disc1] [Demo]
 [ ]  SCUS-94260  PlayStation Underground 2.2 [Disc2] [Demo]
 [ ]  SCUS-94269  PlayStation Underground 2.3 [Disc1] [Demo]
@@ -1221,8 +1220,8 @@ Status
 [ ]  SLUS-00486  PoyPoy
 [ ]  SLUS-00126  Primal Rage
 [ ]  SLUS-00817  Pro 18 - World Tour Golf
-[o]  SLUS-01260  Pro Pinball - Big Race USA
-[ ]  SLUS-01261  Pro Pinball - Fantastic Journey
+[ ]  SLUS-01260  Pro Pinball - Big Race USA
+[o]  SLUS-01261  Pro Pinball - Fantastic Journey
 [ ]  SLUS-00639  Pro Pinball - Timeshock!
 [ ]  SLUS-00371  Pro Pinball (The Web)
 [ ]  SLUS-90039  Pro Pinball Timeshock [Demo]
@@ -1458,7 +1457,7 @@ Status
 [ ]  SLUS-00562  Star Wars - Masters of Teras Kasi
 [!]  SLUS-00381  Star Wars - Rebel Assault II [Disc1of2]
 [!]  SLUS-00386  Star Wars - Rebel Assault II [Disc2of2]
-[ ]  SLUS-00057  Starblade Alpha
+[+]  SLUS-00057  Starblade Alpha
 [ ]  SLUS-01302  Starfighter Sanvein
 [ ]  SLUS-00094  Starwinder - The Ultimate Space Race
 [ ]  SLUS-00093  Steel Harbinger
@@ -1718,7 +1717,7 @@ Status
 [ ]  SLUS-00831  WWF Attitude
 [ ]  SLUS-00246  WWF In Your House
 [ ]  SLUS-00927  WWF Smackdown!
-[ ]  SLUS-01234  WWF Smackdown! 2 - Know Your Role
+[o]  SLUS-01234  WWF Smackdown! 2 - Know Your Role
 [ ]  SLUS-00495  WWF Warzone
 [ ]  SLUS-00013  WWF Wrestlemania - The Arcade Game
 [ ]  SLUS-90021  X-360 - Surrounding Your World with Sound [Demo]
@@ -2328,7 +2327,7 @@ Status
 [ ]  SLES-02893  Disney's Dinosauri
 [ ]  SLES-02892  Disney's Dinosaurier
 [ ]  SLES-04063  Disney's Dinosaurs
-[ ]  SCES-03015  Disney's Ein K��nigreich für ein Lama
+[ ]  SCES-03015  Disney's Ein Königreich für ein Lama
 [ ]  SLES-03984  Disney's Evail avec Winnie l'Ourson
 [ ]  SLES-03178  Disney's Goofy's Fun House
 [ ]  SLES-03639  Disney's Goofy's Fun House
@@ -2450,7 +2449,7 @@ Status
 [ ]  SLES-12995  Driver 2 - Back on the Streets [Disc2of2]
 [ ]  SLES-12997  Driver 2 - Back on the Streets [Disc2of2]
 [ ]  SLES-04045  Dropzone
-[ ]  SLES-03864  DSF Fu�&#159  ball Manager 2002
+[ ]  SLES-03864  DSF Fußball Manager 2002
 [ ]  SLES-02621  Ducati - World Racing Challenge
 [ ]  SLES-02821  Ducati Life - World Racing Challenge
 [ ]  SLES-03377  Ducati World
@@ -2769,9 +2768,9 @@ Status
 [ ]  SLES-00082  G-Police [Disc1of2] [Original & Platinum]
 [ ]  SLES-10854  G-Police [Disc2of2]
 [ ]  SLES-10082  G-Police [Disc2of2] [Original & Platinum]
-[ ]  SCES-00984  Gran Turismo
-[ ]  SCES-02380  Gran Turismo 2 [Arcade Mode Disc]
-[ ]  SCES-12380  Gran Turismo 2 [GT Mode Disc]
+[+]  SCES-00984  Gran Turismo
+[+]  SCES-02380  Gran Turismo 2 [Arcade Mode Disc]
+[o]  SCES-12380  Gran Turismo 2 [GT Mode Disc]
 [ ]  SLES-01714  Grand Theft Auto - London 1969
 [ ]  SLES-03389  Grand Theft Auto - Mission Pack #1 - London 1969 [Original & Collector's Edition Set Disc2of3]
 [ ]  SLES-00032  Grand Theft Auto [Original & Collector's Edition Set Disc1of3]
@@ -3840,7 +3839,7 @@ Status
 [ ]  SLES-00656  Star Wars - Rebel Assault II - The Hidden Empire [Disc1of2]
 [ ]  SLES-10584  Star Wars - Rebel Assault II [Disc2of2]
 [ ]  SLES-10656  Star Wars - Rebel Assault II [Disc2of2]
-[ ]  SCES-00034  Starblade Alpha
+[+]  SCES-00034  Starblade Alpha
 [ ]  SLES-00293  Starfighter 3000
 [ ]  SLES-00090  Starwinder - The Ultimate Space Race
 [ ]  SLED-01553  Station 1 [Demo]
@@ -3941,7 +3940,7 @@ Status
 [ ]  SLES-03241  Technomage - Return of Eternity
 [ ]  SCES-00005  Tekken [Original & Platinum]
 [o]  SCES-00255  Tekken 2
-[ ]  SCES-01237  Tekken 3 [Original & Platinum]
+[f]  SCES-01237  Tekken 3 [Original & Platinum]
 [ ]  SCED-01146  Tekken 3 OUKPSM Collector's Edition
 [ ]  SLES-00316  Tempest X3
 [ ]  SLES-00534  Ten Pin Alley
@@ -5683,7 +5682,7 @@ Status
 [ ]  SCPS-45008  Final Fantasy VII [Disc2of3]
 [ ]  SLPS-00701  Final Fantasy VII [Disc2of3]
 [ ]  SCPS-45009  Final Fantasy VII [Disc3of3]
-[ ]  SLPS-00702  Final Fantasy VII [Disc3of3]
+[f]  SLPS-00702  Final Fantasy VII [Disc3of3]
 [ ]  SCPS-45375  Final Fantasy VIII [Disc1of4]
 [ ]  SLPS-01880  Final Fantasy VIII [Disc1of4]
 [ ]  SLPM-87384  Final Fantasy VIII [Disc1of4] [Ultimate Hits]
@@ -5929,7 +5928,7 @@ Status
 [ ]  SLPM-86042  Gradius Gaiden
 [ ]  SLPM-86103  Gradius Gaiden [PlayStation The Best]
 [ ]  SLPM-87323  Gradius Gaiden [PSone Books]
-[ ]  SCPS-10045  Gran Turismo
+[+]  SCPS-10045  Gran Turismo
 [ ]  SCPS-91128  Gran Turismo [PlayStation The Best]
 [ ]  SCPS-91301  Gran Turismo [PSone Books]
 [ ]  SCPS-10116  Gran Turismo 2 [Arcade Disc]
@@ -6625,14 +6624,15 @@ Status
 [ ]  SLPS-02976  Kowloon's Gate [Artdink Best Choice] [Disc2of4]
 [ ]  SLPS-02977  Kowloon's Gate [Artdink Best Choice] [Disc3of4]
 [ ]  SLPS-02978  Kowloon's Gate [Artdink Best Choice] [Disc4of4]
-[ ]  SLPS-00669  Kowloon's Gate [Disc1of4]
+[f]  SLPS-00669  Kowloon's Gate [Disc1of4]
 [ ]  SLPS-00706  Kowloon's Gate [Disc1of4]
 [ ]  SLPS-00670  Kowloon's Gate [Disc2of4]
 [ ]  SLPS-00707  Kowloon's Gate [Disc2of4]
 [ ]  SLPS-00671  Kowloon's Gate [Disc3of4]
 [ ]  SLPS-00708  Kowloon's Gate [Disc3of4]
 [ ]  SLPS-00672  Kowloon's Gate [Disc4of4]
 [ ]  SLPS-00709  Kowloon's Gate [Disc4of4]
+[ ]  SLPM-80080  Kowloon's Gate [Special Disc]
 [ ]  SLPS-01775  Koyasai - A Sherd of Youthful Memories
 [ ]  SLPS-00492  Krazy Ivan
 [ ]  SLPS-02385  Kukuro Sea Toro - Eternal Eyes
@@ -7911,7 +7911,7 @@ Status
 [ ]  SLPS-02293  Ramen Hashi
 [ ]  SLPS-03139  Ramen Hashi [TomyKore The Best]
 [ ]  SLPS-01546  Rami-Chan no Odeo Surogoku - Keio Yugekitai Gaiden (Guerrilla Warfare Party)
-[ ]  SLPS-00522  Ranma �&#147   - Battle Renaissance
+[ ]  SLPS-00522  Ranma ½ - Battle Renaissance
 [ ]  SLPS-01553  Rapid Angel, The
 [ ]  SCPS-10060  Rapid Racer
 [ ]  SCPS-45282  Rapid Racer

diff --git a/jpsxdec/build.xml b/jpsxdec/build.xml
@@ -9,7 +9,7 @@
 
     <!-- ====== global build properties ====== -->
 
-    <property name="jpsxdec.ver" value="v1-00_rev3921"/>
+    <property name="jpsxdec.ver" value="v1-01_rev3936"/>
 
     <!-- sources -->
     <property name="src.dir.rel"      location="src"      relative="true"/>
@@ -67,7 +67,7 @@
         <mkdir dir="${build-lgpl.dir}"/>
         <javac srcdir="${src-lgpl.dir}" destdir="${build-lgpl.dir}" includeantruntime="false"
             source="${javac.source.ver}" target="${javac.target.ver}"
-               encoding="Cp1252" debug="true">
+               encoding="UTF-8" debug="true">
             <compilerarg value="-Xlint:finally"/>
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:options"/>
@@ -100,7 +100,7 @@
         <mkdir dir="${build.dir}"/>
         <javac srcdir="${src.dir}" destdir="${build.dir}" includeantruntime="false"
             source="${javac.source.ver}" classpath="${release.dir}/${jar-lgpl.file}"
-               target="${javac.target.ver}" encoding="Cp1252" debug="true">
+               target="${javac.target.ver}" encoding="UTF-8" debug="true">
             <compilerarg value="-Xlint:finally"/>
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:options"/>

diff --git a/jpsxdec/doc/CHANGES.txt b/jpsxdec/doc/CHANGES.txt
@@ -1,3 +1,7 @@
+v1.01 rev3936 (16 Nov 2019)
+    - Added support for Starblade Alpha videos
+    Bug fixes:
+    - Replacing audio throws an exception
 v1.00 rev3921 (7 Sept 2019) The "ran out of version numbers" release
     Bug fixes:
     - Unsupported EA videos caused error
@@ -13,7 +17,7 @@ v1.00 rev3921 (7 Sept 2019) The "ran out of version numbers" release
     - Real-time playback stops early if audio ends before video ends
 v0.99.9 rev3898 (9 Aug 2019)
     - Added Italian translation (thanks Gianluigi "Infrid" Cusimano!)
-    - Updated Spanish translation (still many thanks to V�ctor Gonz�lez, Sergi Medina!)
+    - Updated Spanish translation (still many thanks to Víctor González, Sergi Medina!)
     - Minimum required Java version is now version 6
     - Updated to be compatible with Java version 9 and higher
     - Added support for ReBoot video (thanks to XBrav!)
@@ -33,7 +37,7 @@ v0.99.9 rev3898 (9 Aug 2019)
       some video players (primarily on Windows). Use a more reliable player 
       such as VLC media player.
 v0.99.8 rev3788 (21 Jan 2019)
-    - Updated Spanish translation (still many thanks to V�ctor Gonz�lez, Sergi Medina)
+    - Updated Spanish translation (still many thanks to Víctor González, Sergi Medina)
     - Updated Japanese translation (still using Google translate)
     - More thorough searching for content in input files (indexing is slower)
     - Index format changed, indexes need to be regenerated
@@ -88,7 +92,7 @@ v0.99.7 rev3397 (8 Jan 2017) The "road to v1.0" release
     - Improved internationalization
     - Introduced new bugs ;)
 v0.99.6 rev3146 (3 June 2016)
-    - Update Spanish translation (many thanks V�ctor Gonz�lez, Sergi Medina)
+    - Update Spanish translation (many thanks Víctor González, Sergi Medina)
     - Allow replacing FF7 frames with STRv2 frame format
     - Added support for Gran Turismo (1 and 2) videos
     - Simplified error/warning messages
@@ -120,7 +124,7 @@ v0.99.6 rev3146 (3 June 2016)
     - Some .iki frame rate detection is wrong
     - Audio + Video playback on Linux might be choppy or not display
 v0.99.5 rev3006 (5 Jul 2015)
-    - Spanish translation provided by V�ctor Gonz�lez
+    - Spanish translation provided by Víctor González
     - Index format changed, indexes need to be regenerated
     Bug fixes:
     - Indexing fails if XA sector channel = 255 (JPSXDEC-6 reported by truston)

diff --git a/jpsxdec/jPSXdec-design.md b/jpsxdec/jPSXdec-design.md
@@ -6,6 +6,44 @@ This documents the design of jPSXdec as of version 1.00.
 Please also reference `TODO.txt` and `PlayStation1_STR_format.txt`
 to get a bigger perspective on how/why jPSXdec is designed.
 
+## "jPSXdec"?
+
+When choosing a name for this program, I wanted something unique
+so it would be easy to search for.
+
+## `j`
+
+TBH I like the tradition of naming Java programs with the `j` prefix.
+As a Java developer, I am also a Java power user.
+When I know a program is Java based, I can make better use of it,
+and hack it if needed.
+
+## `PSX`
+
+I know there's controversy around using PSX to describe the PS1.
+I wasn't aware of that at the time, and several other tools used
+PSX, so followed their lead.
+
+## `dec`
+
+This was originally intended to mean "decoding",
+similar to the use of "dec" in the term "codec" (which stands
+for "coding and decoding").
+
+Since then, the "dec" could also maybe mean 
+
+* *d*coding
+* *e*ncoding
+* *c*onverting
+
+## How do you say it?
+
+The most straight forward way to say it would be "jay-pee-ess-ex-deck",
+so it's probably the best. I personally rarely refer to the program by name, 
+and often informally shorten it to just "jPSX"* or "PlayStation converter"
+when talking to others about it.
+
+* Note: The name "jpsx" is already taken by the Java only PS1 emulator.
 
 ## Java 6
 
@@ -562,6 +600,8 @@ there's been some confusion around if Java would drop Swing or JavaFX support
 at some point. Whatever the case, the Swing UI will remain unless there is
 some pressing need to convert to JavaFX.
 
+I admit the UI design was inspired by PsxMC.
+
 
 ## `jpsxdec.Main`
 

diff --git a/jpsxdec/src-lgpl/org/jdesktop/swingworker/SwingPropertyChangeSupport.java b/jpsxdec/src-lgpl/org/jdesktop/swingworker/SwingPropertyChangeSupport.java
@@ -1,7 +1,7 @@
 /* 
  * $Id: SwingPropertyChangeSupport.java,v 1.1 2005/06/18 21:27:14 idk Exp $
  * 
- * Copyright © 2005 Sun Microsystems, Inc. All rights
+ * Copyright © 2005 Sun Microsystems, Inc. All rights
  * reserved. Use is subject to license terms.
  */
 

diff --git a/jpsxdec/src-lgpl/org/jdesktop/swingx/BackgroundPainter.java b/jpsxdec/src-lgpl/org/jdesktop/swingx/BackgroundPainter.java
@@ -44,6 +44,7 @@ public BackgroundPainter(Color color) {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void paint(Graphics2D g, JComponent object, int width, int height) {
         if (color == null) {
             return;

diff --git a/jpsxdec/src-lgpl/org/jdesktop/swingx/ForwardingRepaintManager.java b/jpsxdec/src-lgpl/org/jdesktop/swingx/ForwardingRepaintManager.java
@@ -64,6 +64,14 @@ public ForwardingRepaintManager(RepaintManager delegate) {
         this.delegate = Contract.asNotNull(delegate, "delegate is null");
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addDirtyRegion(Applet applet, int x, int y, int w, int h) {
+        delegate.addDirtyRegion(applet, x, y, w, h);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -72,6 +80,14 @@ public void addDirtyRegion(JComponent c, int x, int y, int w, int h) {
         delegate.addDirtyRegion(c, x, y, w, h);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addDirtyRegion(Window window, int x, int y, int w, int h) {
+        delegate.addDirtyRegion(window, x, y, w, h);
+    }
+
     /**
      * {@inheritDoc}
      */