create experimental songmanagement branch

  - nicer abstraction of songs
  - split songloading from handling songs
  - cleanup singscreen

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2706 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 113 insertions, 0 deletions

diff --git a/songmanagement/src/macosx/Info.plist b/songmanagement/src/macosx/Info.plist
new file mode 100644
index 00000000..0456dd9d
--- /dev/null
+++ b/songmanagement/src/macosx/Info.plist
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>UltraStarDeluxe</string>
+	<key>CFBundleExecutable</key>
+	<string>ultrastardx</string>
+	<key>CFBundleGetInfoString</key>
+	<string>UltraStarDeluxe, a SingStar clone</string>
+	<key>CFBundleIconFile</key>
+	<string>ultrastardx.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.ultrastardeluxe.ultrastardeluxe</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>UltraStarDeluxe</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.1</string>
+	<key>CFBundleSignature</key>
+	<string>USDX</string>
+	<key>CFBundleVersion</key>
+	<string>1.1</string>
+	<key>NSAppleScriptEnabled</key>
+	<false/>
+	<key>NSHumanReadableCopyright</key>
+	<string>LGPL</string>
+	<key>NSMainNibFile</key>
+	<string>SDLMain</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/songmanagement/src/macosx/PseudoThread.pas b/songmanagement/src/macosx/PseudoThread.pas
new file mode 100644
index 00000000..d74285f7
--- /dev/null
+++ b/songmanagement/src/macosx/PseudoThread.pas
@@ -0,0 +1,75 @@
+{* UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *}
+
+unit PseudoThread;
+
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I switches.inc}
+
+interface
+
+type
+
+// Debugging threads with XCode doesn't seem to work.
+// We use PseudoThread in Debug mode to get proper debugging.
+
+TPseudoThread = class(TObject)
+  private
+  protected
+    Terminated,
+    FreeOnTerminate: boolean;
+    procedure Execute; virtual; abstract;
+    procedure Resume;
+    procedure Suspend;
+  public
+   constructor Create(const suspended : boolean);
+end;
+
+implementation
+
+{ TPseudoThread }
+
+constructor TPseudoThread.Create(const suspended: boolean);
+begin
+  if not suspended then
+  begin
+    Execute;
+  end;
+end;
+
+procedure TPseudoThread.Resume;
+begin
+  Execute;
+end;
+
+procedure TPseudoThread.Suspend;
+begin
+end;
+
+end.
+