Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert mp3 music to Ogg, clean up some compiler warnings

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@47 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Dylan Smith 2005-05-04 20:49:56 +00:00
parent 3cd2efbd6d
commit f26a7a25d8
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -1,7 +1,7 @@
include $(GNUSTEP_MAKEFILES)/common.make
CP = cp
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
ADDITIONAL_GUI_LIBS = -lGLU -lGL -lasound -lSDL -lpthread -lSDL_mixer
ADDITIONAL_GUI_LIBS = -lGLU -lGL -lSDL -lpthread -lSDL_mixer
ADDITIONAL_CFLAGS = -DLINUX `sdl-config --cflags`
ADDITIONAL_OBJCFLAGS = -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
APP_NAME = oolite

6
PlayerEntity.m
View File

@ -954,9 +954,9 @@ static BOOL galactic_witchjump;
// [afterburner2Sound setDelegate:self];
//
themeMusic = [[ResourceManager movieFromFilesNamed:@"OoliteTheme.mp3" inFolder:@"Music"] retain];
missionMusic = [[ResourceManager movieFromFilesNamed:@"OoliteTheme.mp3" inFolder:@"Music"] retain];
dockingMusic = [[ResourceManager movieFromFilesNamed:@"BlueDanube.mp3" inFolder:@"Music"] retain];
themeMusic = [[ResourceManager movieFromFilesNamed:@"OoliteTheme.ogg" inFolder:@"Music"] retain];
missionMusic = [[ResourceManager movieFromFilesNamed:@"OoliteTheme.ogg" inFolder:@"Music"] retain];
dockingMusic = [[ResourceManager movieFromFilesNamed:@"BlueDanube.ogg" inFolder:@"Music"] retain];
//
collision_radius = 50.0;
//

8
ResourceManager.h
View File

@ -41,6 +41,7 @@ Your fair use and other rights are in no way affected by the above.
#ifdef GNUSTEP
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
#import "OOMusic.h"
#else
#import <Cocoa/Cocoa.h>
#endif
@ -64,7 +65,12 @@ BOOL always_include_addons;
+ (NSSound *) soundNamed:(NSString *)filename inFolder:(NSString *)foldername;
+ (NSImage *) imageNamed:(NSString *)filename inFolder:(NSString *)foldername;
+ (NSString *) stringFromFilesNamed:(NSString *)filename inFolder:(NSString *)foldername;
#ifndef GNUSTEP
#ifdef GNUSTEP
// This method name looks bizarre, but it's just that on OS X the music
// is played by QuickTime which calls everything 'movie', even though in
// this case it isn't.
+ (OOMusic *) movieFromFilesNamed:(NSString *)filename inFolder:(NSString *)foldername;
#else
+ (NSMovie *) movieFromFilesNamed:(NSString *)filename inFolder:(NSString *)foldername;
#endif

4
ResourceManager.m
View File

@ -434,7 +434,7 @@ NSMutableDictionary* movie_cache;
}
#ifdef GNUSTEP
+ (id) movieFromFilesNamed:(NSString *)filename inFolder:(NSString *)foldername
+ (OOMusic *) movieFromFilesNamed:(NSString *)filename inFolder:(NSString *)foldername
{
OOMusic *result = nil;
NSMutableArray *fpaths = [ResourceManager paths];
@ -508,7 +508,7 @@ NSMutableDictionary* movie_cache;
}
//NSLog(@"---> ResourceManager found %d file(s) with name '%@' (in folder '%@')", r, filename, foldername);
if ((result == nil)&&([filename hasSuffix:@"mp3"]))
if ((result == nil)&&([filename hasSuffix:@"ogg"]))
{
// look for an alternative .mid file
NSString *midifilename = [[filename stringByDeletingPathExtension] stringByAppendingPathExtension:@"mid"];