1. 13 Oct, 2009 10 commits
  2. 12 Oct, 2009 6 commits
    • Sam Lantinga's avatar
      Merged fix from SDL 1.3 · 9e00bd18
      Sam Lantinga authored
      --HG--
      branch : SDL-1.2
      extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404065
      9e00bd18
    • Sam Lantinga's avatar
      Steven Noonan to sdl · deaf4b7e
      Sam Lantinga authored
      While trying to build the SDLMain.m included with SDL 1.2.14, with
      #define SDL_USE_NIB_FILE 1:
      
      /Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:
      In function '-[SDLMain fixMenu:withAppName:]':
      /Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:122:
      warning: 'sizeToFit' is deprecated (declared at
      /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSMenu.h:281)
      /Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:
      In function 'main':
      /Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:376:
      warning: 'poseAsClass:' is deprecated (declared at
      /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObject.h:127)
      /Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:376:
      error: 'poseAsClass:' is unavailable (declared at
      /Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObject.h:127)
      /Users/steven/Development/darwinia/targets/macosx/Darwinia/SDLMain.m:377:
      warning: passing argument 2 of 'NSApplicationMain' from incompatible
      pointer type
      
      
      
      Eric Wing to Sam
      
      I don't have time today to look at this in detail, but the problem is definitely the poseAsClass: method.
      This was deprecated in Obj-C 2.0 and not retained in 64-bit.
      
      I've never used this method and it has always been limited to esoteric uses. I think this is why Apple wanted to dump it (among complicating some other things they do). I have read about others getting bit by this when migrating. Long story short, there really isn't a migration path for this method. The question that then must be asked is why are we using it (what does it accomplish), and then figure out the 'proper' way of accomplishing that.
      
      Glancing at SDLMain.m, it's not obvious to me why it is there or what it is really accomplishing. My only speculation is that NSApplicationMain hardcodes something to look for NSApplication and a subclass (SDLApplication) fails for some reason (assuming that the original coder did this for good reason).
      
      Three thoughts come to mind.
      1) The Info.plist has properties to control things related to the startup class and nib.
      NSPrincipalClass, NSMainNibFile
      
      Maybe principle class needs to be SDLApplication and we can delete the poseAs
      
      2) I was told that 10.6 introduced new APIs to make programatic NIB wrangling and avoidance easier. Unfortunately, I don't know the specifics.
      
      
      3) Instead of subclassing NSApplication in SDLMain.m, maybe we can just add a category. It looks like the following is the only thing that is done (quick glance):
      
      @interface SDLApplication : NSApplication
      @end
      
      @implementation SDLApplication
      /* Invoked from the Quit menu item */
      - (void)terminate:(id)sender
      {
         /* Post a SDL_QUIT event */
         SDL_Event event;
         event.type = SDL_QUIT;
         SDL_PushEvent(&event);
      }
      @end
      
      
      So instead, we change this to: (warning written in mail and untested)
      
      @interface NSApplication (SDLApplication)
      - (void) terminate:(id)sender;
      @end
      
      @implementation NSApplication (SDLApplication)
      /* Invoked from the Quit menu item */
      - (void)terminate:(id)sender
      {
         /* Post a SDL_QUIT event */
         SDL_Event event;
         event.type = SDL_QUIT;
         SDL_PushEvent(&event);
      }
      @end
      
      
      Then everywhere SDLApplication is used, we change it to NSApplication (and remove the poseAsClass line).
      
      Perhaps you could ask the bug reporter to try this solution (#3).
      And if that fails, maybe try #1.
      
      
      -Eric
      
      
      Steven Noonan to Sam
      
      The suggested change (diff below) seems to work fine.
      
      - Steven
      
      --HG--
      branch : SDL-1.2
      extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404064
      deaf4b7e
    • Sam Lantinga's avatar
      Joystick patch from FreeBSD ports system · 0e89501b
      Sam Lantinga authored
      --HG--
      branch : SDL-1.2
      extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404060
      0e89501b
    • Ryan C. Gordon's avatar
      Forcibly disabled MMX mixers. · d5b19efe
      Ryan C. Gordon authored
        Hopefully fixes Bugzilla #649.
      
      --HG--
      branch : SDL-1.2
      extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404059
      d5b19efe
    • Ryan C. Gordon's avatar
      Whoops, need to convert from bits to bytes for frame size. · 5409db51
      Ryan C. Gordon authored
      --HG--
      branch : SDL-1.2
      extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404057
      5409db51
    • Ryan C. Gordon's avatar
      Corrected misuse of snd_pcm_writei() in ALSA driver. · c865dbf8
      Ryan C. Gordon authored
        Hopefully fixes Bugzilla #650.
      
      --HG--
      branch : SDL-1.2
      extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%404056
      c865dbf8
  3. 10 Oct, 2009 24 commits