Fixed mistakes in my previous commit.

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu~.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu~.nib/classes.nib
deleted file mode 100644 (file)
index a7cbbe6..0000000
--- a/extras/MacOSX/Resources/English.lproj/MainMenu~.nib/classes.nib
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {
-                fullscreen_toggle = id; 
-                pause = id; 
-                play = id; 
-                speedslider_update = id; 
-                timeslider_update = id; 
-            }; 
-            CLASS = Intf_Controller; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                o_currenttime = id; 
-                o_menu_fullscreen = id; 
-                o_outputpanel = id; 
-                o_pause = id; 
-                o_play = id; 
-                o_playlistds = id; 
-                o_qdview = id; 
-                o_stepf = id; 
-                o_stepr = id; 
-                o_stop = id; 
-                o_timeslider = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {
-            CLASS = Intf_PlaylistDS; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {o_table = id; }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {CLASS = VlcQuickDrawView; LANGUAGE = ObjC; SUPERCLASS = NSQuickDrawView; }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu~.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu~.nib/info.nib
deleted file mode 100644 (file)
index 903d320..0000000
--- a/extras/MacOSX/Resources/English.lproj/MainMenu~.nib/info.nib
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-       <key>IBDocumentLocation</key>
-       <string>87 157 428 240 0 0 1280 938 </string>
-       <key>IBFramework Version</key>
-       <string>219.0</string>
-       <key>IBMainMenuLocation</key>
-       <string>420 524 257 44 0 0 1280 938 </string>
-       <key>IBSystem Version</key>
-       <string>5L14</string>
-       <key>IBUserGuides</key>
-       <dict/>
-</dict>
-</plist>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu~.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu~.nib/objects.nib
deleted file mode 100644 (file)
index c50e0e5..0000000
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu~.nib/objects.nib and /dev/null differ

diff --git a/extras/MacOSX/vlc.pbproj/fgp.pbxuser b/extras/MacOSX/vlc.pbproj/fgp.pbxuser
deleted file mode 100644 (file)
index 07d1231..0000000
--- a/extras/MacOSX/vlc.pbproj/fgp.pbxuser
+++ /dev/null
@@ -1,109 +0,0 @@
-// !$*UTF8*$!
-{
-       F510A6CD01738ED001A80A1F = {
-               uiCtxt = {
-                       sepNavWindowFrame = "{{15, 431}, {750, 502}}";
-               };
-       };
-       F511306E0170620B01A80A1F = {
-               activeBuildStyle = F51130710170620B01A80A1F;
-               activeTarget = F52EEB23017E3F0701A80A1F;
-               addToTargets = (
-                       F52EEB23017E3F0701A80A1F,
-               );
-               breakpoints = (
-               );
-               perUserDictionary = {
-                       PBXWorkspaceConfiguration = {
-                               ContentSize = "{1280, 819}";
-                               LeftSlideOut = {
-                                       ActiveTab = 0;
-                                       Frame = "{{0, 23}, {1280, 796}}";
-                                       Split0 = {
-                                               ActiveTab = 2;
-                                               Frame = "{{323, 0}, {957, 796}}";
-                                               Split0 = {
-                                                       Frame = "{{0, 75}, {957, 721}}";
-                                               };
-                                               SplitCount = 1;
-                                               Tab0 = {
-                                                       Debugger = {
-                                                               Frame = "{{0, 0}, {484, 208}}";
-                                                               Split0 = {
-                                                                       Frame = "{{0, 25}, {484, 183}}";
-                                                                       Split0 = {
-                                                                               Frame = "{{0, 0}, {236, 183}}";
-                                                                       };
-                                                                       Split1 = {
-                                                                               Frame = "{{245, 0}, {239, 183}}";
-                                                                       };
-                                                                       SplitCount = 2;
-                                                               };
-                                                               SplitCount = 1;
-                                                               Tab0 = {
-                                                                       Frame = "{{0, 0}, {100, 50}}";
-                                                               };
-                                                               Tab1 = {
-                                                                       Frame = "{{0, 0}, {100, 50}}";
-                                                               };
-                                                               TabCount = 2;
-                                                       };
-                                                       Frame = "{{0, 0}, {484, 208}}";
-                                                       LauncherConfigVersion = 4;
-                                               };
-                                               Tab1 = {
-                                                       Frame = "{{0, 0}, {484, 208}}";
-                                                       LauncherConfigVersion = 3;
-                                                       Runner = {
-                                                               Frame = "{{0, 0}, {484, 208}}";
-                                                       };
-                                               };
-                                               Tab2 = {
-                                                       BuildMessageFrame = "{{0, 0}, {959, 43}}";
-                                                       BuildTranscriptFrame = "{{0, 52}, {959, 0}}";
-                                                       Frame = "{{0, 0}, {957, 50}}";
-                                               };
-                                               Tab3 = {
-                                                       Frame = "{{0, 0}, {612, 295}}";
-                                               };
-                                               TabCount = 4;
-                                       };
-                                       SplitCount = 1;
-                                       Tab0 = {
-                                               Frame = "{{0, 0}, {298, 796}}";
-                                       };
-                                       Tab1 = {
-                                               ClassesFrame = "{{0, 0}, {202, 56}}";
-                                               Frame = "{{0, 0}, {200, 100}}";
-                                               MembersFrame = "{{0, 65}, {202, 35}}";
-                                               OptionsSetName = "Hierarchy, all classes";
-                                       };
-                                       Tab2 = {
-                                               Frame = "{{0, 0}, {200, 100}}";
-                                       };
-                                       Tab3 = {
-                                               Frame = "{{0, 0}, {200, 718}}";
-                                               Split0 = {
-                                                       Frame = "{{0, 0}, {200, 349}}";
-                                               };
-                                               Split1 = {
-                                                       Frame = "{{0, 358}, {200, 360}}";
-                                               };
-                                               SplitCount = 2;
-                                       };
-                                       Tab4 = {
-                                               Frame = "{{0, 0}, {250, 781}}";
-                                       };
-                                       TabCount = 5;
-                               };
-                       };
-               };
-               wantsIndex = 1;
-               wantsSCM = 0;
-       };
-       F52EEB23017E3F0701A80A1F = {
-               activeExec = 0;
-               customExecs = {
-               };
-       };
-}

diff --git a/plugins/macosx/aout_macosx.c b/plugins/macosx/aout_macosx.c
index 1b04162e0293e3a463638074e4ebf3b2d38f8259..a3f81b2df36c502e9a1b4eff48a3283013678967 100644 (file)
--- a/plugins/macosx/aout_macosx.c
+++ b/plugins/macosx/aout_macosx.c
@@ -2,7 +2,7 @@
  * aout_darwin.c : Darwin audio output plugin
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: aout_macosx.c,v 1.4 2001/10/08 16:20:25 massiot Exp $
+ * $Id: aout_macosx.c,v 1.5 2001/10/30 23:45:08 massiot Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *
@@ -34,6 +34,7 @@
  * Find 8 bits files and adapt output
  */
  
+#define MODULE_NAME macosx
 #include "modules_inner.h"
 
 /*****************************************************************************