diff options
| -rw-r--r-- | README Mac OS X | 47 | ||||
| -rw-r--r-- | src/base/UPlatformMacOSX.pas | 9 | ||||
| -rw-r--r-- | src/config-darwin.inc | 2 | ||||
| -rw-r--r-- | src/media/UAudioInput_Portaudio.pas | 3 | ||||
| -rw-r--r-- | src/media/UVisualizer.pas | 1 | ||||
| -rw-r--r-- | src/screens/UScreenSong.pas | 10 |
6 files changed, 69 insertions, 3 deletions
diff --git a/README Mac OS X b/README Mac OS X new file mode 100644 index 00000000..2bc83908 --- /dev/null +++ b/README Mac OS X @@ -0,0 +1,47 @@ +UltraStar Deluxe Mac Specific README +------------------------------------ + +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->8 - - + _______ _________ + ___ / \/ \_______ + / \ \ _/ /\____/ \__________ + / _/ / / \______ \ \___ _____ + / |___/ \ \_/ / \ \ / \ + \ /\ / |\ \ \/ / + \ / \_ultrastardeluxe_/ |/ / / + \______www_/ |____________org_/ \ + / /\ ~=~ \ + \_____/ \ mog / + ~=~ +- - 8<- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + ============================ += 1. Installation = += 2. Song Folders = + ============================ + +SF.Net Page: http://sourceforge.net/projects/ultrastardx/ +Wiki: http://wiki.ultrastardeluxe.org/ + + ==================== + = 1. Installation = + ==================== + +Drag the application to your hard disk. It should run from any folder. + + ==================== + = 2. Song Folders = + ==================== + +- The primary folder for songs is "$HOME/Music/UltraStar Deluxe", which is + created when UltraStar Deluxe is run for the first time. + +- Further folders can be added through the configuration file "config.ini", + which is created in "$HOME/Library/Application Support/UltraStarDeluxe" + when UltraStar Deluxe is run for the first time. + + example: + [Directories] + SongDir1=/Users/My/Music/MyUSDXSongs + SongDir2=/Volumes/MyExternalUSBDisk + SongDir...=... (some more directories) diff --git a/src/base/UPlatformMacOSX.pas b/src/base/UPlatformMacOSX.pas index 7115a6b0..3a3e3f79 100644 --- a/src/base/UPlatformMacOSX.pas +++ b/src/base/UPlatformMacOSX.pas @@ -88,6 +88,15 @@ type * bundle, which contains the default files. USDX should not delete files or * folders in Application Support/UltraStarDeluxe automatically or without * user confirmation. + * + * The log and benchmark files are stored in + * $HOME/Library/Log/UltraStar Deluxe/ + * + * Music should go into ~/Music/UltraStar Deluxe/ + * + * ~/Library/Application Support/UltraStarDeluxe/songs is also used. + * The idea is to remove this at some time. + * *} TPlatformMacOSX = class(TPlatform) private diff --git a/src/config-darwin.inc b/src/config-darwin.inc index 4c128a05..5eb38d76 100644 --- a/src/config-darwin.inc +++ b/src/config-darwin.inc @@ -1,5 +1,5 @@ {***************************************************************** - * Configuration file for ultrastardx 1.1-beta + * Configuration file for ultrastardx 1.1 * src/config-darwin.inc. Generated from config.inc.in by configure. *****************************************************************} diff --git a/src/media/UAudioInput_Portaudio.pas b/src/media/UAudioInput_Portaudio.pas index c7364eb4..786318b0 100644 --- a/src/media/UAudioInput_Portaudio.pas +++ b/src/media/UAudioInput_Portaudio.pas @@ -517,7 +517,8 @@ function MicrophoneCallback(input: pointer; output: pointer; frameCount: culong; inputDevice: pointer): cint; cdecl; begin AudioInputProcessor.HandleMicrophoneData(input, frameCount*4, inputDevice); - result := paContinue; +// rauls bug ist behoben mit: AudioInputProcessor.HandleMicrophoneData(input, frameCount*2, inputDevice); +result := paContinue; end; {* diff --git a/src/media/UVisualizer.pas b/src/media/UVisualizer.pas index 1cdc3500..e2995c04 100644 --- a/src/media/UVisualizer.pas +++ b/src/media/UVisualizer.pas @@ -532,6 +532,7 @@ begin begin // Create() might fail if the config-file is not found Log.LogError('TProjectM.Create: ' + E.Message, 'TVideoPlayback_ProjectM.VisualizerStart'); + Log.LogError('TProjectM.Create: ', fProjectMPath + 'config.inp'); Exit; end; end; diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas index 6fe8d204..abd4f760 100644 --- a/src/screens/UScreenSong.pas +++ b/src/screens/UScreenSong.pas @@ -283,15 +283,23 @@ begin SDL_ModState := SDL_GetModState and (KMOD_LSHIFT + KMOD_RSHIFT + KMOD_LCTRL + KMOD_RCTRL + KMOD_LALT + KMOD_RALT); + Log.LogError('TScreenSong.ParseInput', 'SDL_ModState: ' + IntToStr(SDL_ModState)); + Log.LogError('TScreenSong.ParseInput', 'KMOD_LALT: ' + IntToStr(KMOD_LALT)); + Log.LogError('TScreenSong.ParseInput', 'Mode: ' + IntToStr(Ord(Mode))); + Log.LogError('TScreenSong.ParseInput', 'smNormal: ' + IntToStr(Ord(smNormal))); + Log.LogError('TScreenSong.ParseInput', 'PressedKey: ' + IntToStr(Ord(PressedKey))); + Log.LogError('TScreenSong.ParseInput', 'CharCode: ' + IntToStr(Ord(CharCode))); //Jump to Artist/Titel if ((SDL_ModState and KMOD_LALT <> 0) and (Mode = smNormal)) then begin - UpperLetter := UCS4UpperCase(CharCode); + UpperLetter := UCS4UpperCase(PressedKey); + Log.LogError('TScreenSong.ParseInput', 'UpperLetter: ' + IntToStr(Ord(UpperLetter))); if (UpperLetter in ([Ord('A')..Ord('Z'), Ord('0') .. Ord('9')]) ) then begin I2 := Length(CatSongs.Song); + Log.LogError('TScreenSong.ParseInput', '**** Got a key.'); //Jump To Titel if (SDL_ModState = (KMOD_LALT or KMOD_LSHIFT)) then |