* Remove last remenants of info.h and info.m

* Better align the iTunes styled slider with other UI elements
* added .spx .ts and .ps fileextensions.

diff --git a/Makefile.am b/Makefile.am
index 9cdb50d8c494d8889022ad33c4d65f80e0fcd040..f6b44955e03d5660b84b4d41f1667224249492da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -462,8 +462,6 @@ VLC.app: vlc
            applescript.m \
            controls.h \
            controls.m \
-           info.h \
-           info.m \
            intf.h \
            intf.m \
            macosx.m \

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 0c942f7e107e264adcfde2c6c1bfd61d3c8df950..c3a05743c5e966839e33caf7562e695290ea9973 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>29 -15 505 517 0 0 800 578 </string>
+       <string>391 199 505 517 0 0 1280 1002 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
@@ -21,9 +21,10 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>21</integer>
-               <integer>1617</integer>
                <integer>29</integer>
+               <integer>1617</integer>
+               <integer>21</integer>
+               <integer>1647</integer>
        </array>
        <key>IBSystem Version</key>
        <string>7F44</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 3e169633af73dadc98e3f4457f85f36e986e7d9d..f19413d666edc2d6d426ac51c14b43f844b53cbc 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index 7391b30e3a5f0605278d2a707d8e811802cbba82..d9fa8f8e9a6d0f669cc4837f88fdacf655d5268d 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -140,6 +140,26 @@
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
+               <dict>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>spx</string>
+                       </array>
+                       <key>CFBundleTypeName</key>
+                       <string>Speex Audio File</string>
+                       <key>CFBundleTypeRole</key>
+                       <string>Viewer</string>
+               </dict>
+               <dict>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>sdp</string>
+                       </array>
+                       <key>CFBundleTypeName</key>
+                       <string>Session Description Protocol File</string>
+                       <key>CFBundleTypeRole</key>
+                       <string>Viewer</string>
+               </dict>
                <dict>
                        <key>CFBundleTypeExtensions</key>
                        <array>
@@ -450,12 +470,23 @@
                        <key>CFBundleTypeExtensions</key>
                        <array>
                                <string>m2p</string>
+                               <string>ps</string>
                        </array>
                        <key>CFBundleTypeName</key>
                        <string>MPEG-2 Program Stream</string>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
+               <dict>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>ts</string>
+                       </array>
+                       <key>CFBundleTypeName</key>
+                       <string>MPEG-2 Transport Stream</string>
+                       <key>CFBundleTypeRole</key>
+                       <string>Viewer</string>
+               </dict>
                <dict>
                        <key>CFBundleTypeExtensions</key>
                        <array>
@@ -535,6 +566,7 @@
                        <key>CFBundleTypeExtensions</key>
                        <array>
                                <string>m4a</string>
+                               <string>m4p</string>
                        </array>
                        <key>CFBundleTypeName</key>
                        <string>MPEG-4 Audio File</string>
@@ -745,8 +777,6 @@
                                8ED6C27B03E2EB1C0059A3A7,
                                8ED6C27C03E2EB1C0059A3A7,
                                8ED6C27D03E2EB1C0059A3A7,
-                               8EF1600B03FC62560059A3A7,
-                               8EF1600C03FC62560059A3A7,
                                8ED6C27E03E2EB1C0059A3A7,
                                8ED6C27F03E2EB1C0059A3A7,
                                8ED6C28003E2EB1C0059A3A7,
@@ -1923,24 +1953,6 @@
                        settings = {
                        };
                };
-               8EF1600B03FC62560059A3A7 = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       name = info.h;
-                       path = ../../modules/gui/macosx/info.h;
-                       refType = 2;
-                       sourceTree = SOURCE_ROOT;
-               };
-               8EF1600C03FC62560059A3A7 = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.objc;
-                       name = info.m;
-                       path = ../../modules/gui/macosx/info.m;
-                       refType = 2;
-                       sourceTree = SOURCE_ROOT;
-               };
 //8E0
 //8E1
 //8E2