* backport of [11356]

diff --git a/NEWS b/NEWS
index fa53a5adf52b0dc01ef92679bc3dcf279e9f7fea..4e4c7c4e394d13b67119d8b2f2171c496960905d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -71,7 +71,6 @@ Video output:
  * Motion detection filter (can trigger playlist actions)
  * Improvements to wall video filter
  * Support for font color and opacity
- * Fixed Mac OS X OpenGL output
 
 Stream output:
  * Muxers
@@ -104,7 +103,8 @@ Windows port:
  * Support for no-decoration windows
 
 MacOS X port:
- * Many Tiger related fixes
+ * Many Mac OS X 10.4 Tiger related fixes
+ * The OpenGL video output is back
  * A new audio module that should work more reliable for analog audio output in various configurations.
    - Supports multichannel discrete analog output
    - Digital audio output requires you to change a preference setting because it

diff --git a/README.MacOSX.rtf b/README.MacOSX.rtf
index 0c621a6182c34dfb002a2cbb0e99f5f6d468419f..ffc0a7ae2c7fe6217c37a0b007882446c6350409 100644 (file)
--- a/README.MacOSX.rtf
+++ b/README.MacOSX.rtf
@@ -2,7 +2,7 @@
 {\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fmodern\fcharset77 Courier;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww9000\viewh9000\viewkind0
+\vieww16720\viewh14740\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
 \f0\fs48 \cf0 VLC media player, version 0.8\
@@ -40,8 +40,9 @@ The following frequently asked questions are answered below :\
 
 \f0\b0 \cf0 \ulnone \
 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f1\b \ul 1. How do I install ?
+\f1\b \cf0 \ul 1. How do I install ?
 \f0\b0 \ulnone \
 When you download VLC media player, you will end up with a VLC-0.8.x.dmg file. Double-click, or drop it on the application Disk Copy, to open this file. An icon will now appear on your Desktop, right beside your drive(s). Open it and drag the VLC application from the resulting window to the place where you want to install it. Most often this is the directory Applications on your main harddrive.\
 \
@@ -60,8 +61,9 @@ To view a (S)VCD, DVD or Audio CD, you will need to choose "Open Disc" from the
 \
 
 \f1\b \ul 4. The video is choppy! It's like we're dropping frames.\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f0\b0 \ulnone That's the normal behavior when the CPU isn't fast enough to decode all the frames. Though there is some room for improvement, don't ever expect VLC to be able to decode MPEG-2 streams or high resolution DivX on a low-end G3 machine.\
+\f0\b0 \cf0 \ulnone That's the normal behavior when the CPU isn't fast enough to decode all the frames. Though there is some room for improvement, don't ever expect VLC to be able to decode MPEG-2 streams or high resolution DivX on a low-end G3 machine.\
 \
 If you experience problems playing DivX/Xvid then you can try the following:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
@@ -76,34 +78,42 @@ If VLC media player is slow on your G4 system, try to quit or hide all running a
 \f0  in a terminal window which applications take the CPU. Be aware of bouncing icons in the dock. Bounces seriously effect the performance of VLC. The same goes for any time interval process (Checking mail every 2 minutes).\
 \
 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f1\b \ul 5. How do I remove VLC media player ?
+\f1\b \cf0 \ul 5. How do I remove VLC media player ?
 \f0\b0 \ulnone \
 Simply drag VLC from the place where you had installed it, to the Trash.\
 \
 \
 
 \f1\b \ul 6. Where can I find an older version for Mac OS 9 ?\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f0\b0 \ulnone There is no version for Mac OS 9. VLC is originally a UNIX application and has never been ported to Mac OS 9. Considering the amount of differences between Mac OS 9 and modern systems, it would require a tremendous effort to port VLC. We do not plan to do it, because we prefer to focus on creating a very good Mac OS X application. So please don't ask.\
+\f0\b0 \cf0 \ulnone There is no version for Mac OS 9. VLC is originally a UNIX application and has never been ported to Mac OS 9. Considering the amount of differences between Mac OS 9 and modern systems, it would require a tremendous effort to port VLC. We do not plan to do it, because we prefer to focus on creating a very good Mac OS X application. So please don't ask.\
 \
 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f1\b \ul 7. How do I change the size of the video window ?\
+\f1\b \cf0 \ul 7. How do I change the size of the video window ?\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f0\b0 \ulnone Grab the bottom-right corner of the video window and drag the window to its desired size. You can also set half, normal and double sizes from the Video menu.\
+\f0\b0 \cf0 \ulnone Grab the bottom-right corner of the video window and drag the window to its desired size. You can also set half, normal and double sizes from the Video menu.\
 \
 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f1\b \ul 8. I think I found a bug. What should I do ?\
+\f1\b \cf0 \ul 8. I think I found a bug. What should I do ?\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f0\b0 \ulnone First try resetting your preferences by clicking "Reset All" in the preferences dialog. If this doesn't work then you can report the exact conditions under which the bug/crash occurred back to the VLC team. For more information on bugreporting please read \ul http://www.videolan.org/support/bug-reporting.html\ulnone \
+\f0\b0 \cf0 \ulnone First try resetting your preferences by clicking "Reset All" in the preferences dialog. If this doesn't work then you can report the exact conditions under which the bug/crash occurred back to the VLC team. For more information on bugreporting please read \ul http://www.videolan.org/support/bug-reporting.html\ulnone \
 \
 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f1\b \ul 9. Support for files with subtitles.\
+\f1\b \cf0 \ul 9. Support for files with subtitles.\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f0\b0 \ulnone - VLC will autodetect subtitle files when they are in the same directory as your movie and contain the movie's filename.\
+\f0\b0 \cf0 \ulnone - VLC will autodetect subtitle files when they are in the same directory as your movie and contain the movie's filename.\
 - DVD and autodetected subtitles  can be enabled trough the Video -> Subtitles Track menu-item.\
 - Only Vobsub, MicroDVD, SubRIP, SSA1-4. SAMI and vplayer subtitle files are supported at the moment.\
 - You cannot change anything about DVD and Vobsub subtitles.\
@@ -113,8 +123,9 @@ Simply drag VLC from the place where you had installed it, to the Trash.\
 - You cannot change the font color or the thickness of the outlines.\
 \
 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f1\b \ul 10. What do all the options in the preferences do ?
+\f1\b \cf0 \ul 10. What do all the options in the preferences do ?
 \f0\b0 \ulnone \
 Hold your mouse still on top of an option for just over a second and a ToolTip will come up explaining what the option does. Be very careful with the Advanced options. Changing an option in the wrong value (usually selecting a module by hand instead of letting it be selected automatically) can cause VLC to no longer start. In this case you will need to remove the preference files located in your HOME -> Library -> Preferences -> VLC.\
 \
@@ -127,18 +138,21 @@ If you want to use your second screen for fullscreen playback, then look at the
 \
 
 \f1\b \ul 12. Multiple sound-devices and multi-channel sound? \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f0\b0 \ulnone Look at the Audio->Device menuitem. You can set this option permanently by going into the Preferences and choosing Modules -> audio output -> coreaudio -> audio device (You will need to choose "Show Advanced options" first).\
+\f0\b0 \cf0 \ulnone Look at the Audio->Audio Device menuitem.\
 - You should change your speakerlayout in the Audio Midi Setup utility. The program is located in /Applications/Utilities.\
 Select your audio device in "Properties For:", then click the "Configure Speakers" button. Choose "Multichannel". Even if these settings are correct, you should change them and click "Apply", then change them back and again click "Apply". This is important, otherwise VLC cannot reliably detect which speakers are connected.\
+- Make sure your device surround configuration is not set to emulate surround output. M-Audio for instance defaults to using SRS surround sound emulation in multichannel setups. You should change this to "None/OpenAL".\
 - We are in a transitional phase for our Mac OS X audio system. Therefore it is currently not possible to use Digital audio without changing a Preferences setting. The setting is in Audio->Output modules. Change this from default to "CoreAudio output". This is the module that was also used in previous versions of VLC. It has several issues with Analog audio, but it also supports Digital audio, which the new module does not yet support. You should ONLY use this module for Digital output.\
 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f1\b \cf0 \ul \ulc0 13. I have a problem or a feature request \
+\f1\b \cf0 \ul 13. I have a problem or a feature request \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
 
-\f0\b0 \ulnone Your first stop is \ul http://www.videolan.org/doc\ulnone . The documentation on this page can usually help you with your problems. If you cannot find an aswer there then please visit \ul http://forum.videolan.org.\ulnone  Use the Search function there and see if someone else might have already answered your question or run into your problem. Feature requests can also be made in the Request forum.\
+\f0\b0 \cf0 \ulnone Your first stop is \ul http://www.videolan.org/doc\ulnone . The documentation on this page can usually help you with your problems. If you cannot find an aswer there then please visit \ul http://forum.videolan.org.\ulnone  Use the Search function there and see if someone else might have already answered your question or run into your problem. Feature requests can also be made in the Request forum.\
 \
 For additional information and support, please see: \ul http://www.videolan.org/support\ulnone \
 -- \

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 2e173184ba06468d9edba4cfb76ea3985b8dd641..6b5a242df14a12359b957827cb950c4e93cdeaaa 100644 (file)
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -2,7 +2,7 @@
  * auhal.c: AUHAL output plugin
  *****************************************************************************
  * Copyright (C) 2005 VideoLAN
- * $Id: coreaudio.c 10101 2005-03-02 16:47:31Z robux4 $
+ * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
  *
@@ -289,10 +289,10 @@ static int Open( vlc_object_t * p_this )
             case kAudioChannelLabel_RightSurround:
                 p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARRIGHT;
                 continue;
-            case kAudioChannelLabel_LeftCenter:
+            case kAudioChannelLabel_RearSurroundLeft:
                 p_aout->output.output.i_physical_channels |= AOUT_CHAN_MIDDLELEFT;
                 continue;
-            case kAudioChannelLabel_RightCenter:
+            case kAudioChannelLabel_RearSurroundRight:
                 p_aout->output.output.i_physical_channels |= AOUT_CHAN_MIDDLERIGHT;
                 continue;
             case kAudioChannelLabel_CenterSurround: