* Got rid of SYS_DARWIN everywhere.

[vlc] / modules / video_output / opengl.c

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 60703b9ddfa3d77a3f9e8f724c443d540ead2422..d896e7ca3e52c75245cddae800f5f448b45ceaaa 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -33,7 +33,7 @@
 #include <vlc/vlc.h>
 #include <vlc/vout.h>
 
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 
@@ -133,7 +133,7 @@ vlc_module_begin();
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
     set_description( _("OpenGL video output") );
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
     set_capability( "video output", 200 );
 #else
     set_capability( "video output", 20 );
@@ -187,7 +187,7 @@ static int CreateVout( vlc_object_t *p_this )
     var_Create( p_vout, "opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
 
     p_sys->i_index = 0;
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
     p_sys->i_tex_width  = p_vout->fmt_in.i_width;
     p_sys->i_tex_height = p_vout->fmt_in.i_height;
 #else
@@ -268,7 +268,7 @@ static int Init( vout_thread_t *p_vout )
 
     p_sys->p_vout->pf_init( p_sys->p_vout );
 
-#if defined( SYS_DARWIN ) || (VLCGL_FORMAT == YCBCR_MESA)
+#if defined( __APPLE__ ) || (VLCGL_FORMAT == YCBCR_MESA)
     p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2');
     i_pixel_pitch = 2;
 
@@ -466,12 +466,19 @@ static int Manage( vout_thread_t *p_vout )
         p_vout->fmt_in.i_visible_width;
     p_vout->fmt_out.i_visible_height = p_sys->p_vout->fmt_in.i_visible_height =
         p_vout->fmt_in.i_visible_height;
+    p_vout->fmt_out.i_aspect = p_sys->p_vout->fmt_in.i_aspect =
+        p_vout->fmt_in.i_aspect;
+    p_vout->fmt_out.i_sar_num = p_sys->p_vout->fmt_in.i_sar_num =
+        p_vout->fmt_in.i_sar_num;
+    p_vout->fmt_out.i_sar_den = p_sys->p_vout->fmt_in.i_sar_den =
+        p_vout->fmt_in.i_sar_den;
+    p_vout->output.i_aspect = p_vout->fmt_in.i_aspect;
 
     p_sys->p_vout->i_changes = p_vout->i_changes;
     i_ret = p_sys->p_vout->pf_manage( p_sys->p_vout );
     p_vout->i_changes = p_sys->p_vout->i_changes;
 
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
     if( p_sys->p_vout->pf_lock &&
         p_sys->p_vout->pf_lock( p_sys->p_vout ) )
     {
@@ -551,7 +558,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
         return;
     }
 
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
     int i_new_index;
     i_new_index = ( p_sys->i_index + 1 ) & 1;
 
@@ -601,7 +608,7 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
 
     /* glTexCoord works differently with GL_TEXTURE_2D and
        GL_TEXTURE_RECTANGLE_EXT */
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
     f_x = (float)p_vout->fmt_out.i_x_offset;
     f_y = (float)p_vout->fmt_out.i_y_offset;
     f_width = (float)p_vout->fmt_out.i_x_offset +
@@ -742,7 +749,7 @@ static int InitTextures( vout_thread_t *p_vout )
 
         glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
 
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
         /* Tell the driver not to make a copy of the texture but to use
            our buffer */
         glEnable( GL_UNPACK_CLIENT_STORAGE_APPLE );