Changeset 1ce23b854fd7bf0805f1cdd5969ac8c2ead2d5c3

Timestamp:

04/20/04 03:00:29 (4 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1082422829 +0000

git-parent:

[aff2275604f2aba8da89b9ec6bffaed40dee02df]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1082422829 +0000

Message:

* extras/contrib/src

• fix goom location
  
• some small url improvements. please test the contrib system.
  

* modules/gui/macosx/*

• autodetect Quartz Extreme. Use OpenGL vout if present.
  
• --macosx-vout auto|quartz|opengl to force a vout.
  

* Makefile.am: add share/http/vlm to target.
* NEWS: small updates
* AUTHORS: updated my email address.

Files:

• AUTHORS (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• NEWS (modified) (3 diffs)
• extras/contrib/src/Makefile (modified) (2 diffs)
• extras/contrib/src/packages.mak (modified) (4 diffs)
• modules/gui/macosx/macosx.m (modified) (3 diffs)
• modules/gui/macosx/vout.m (modified) (4 diffs)

AUTHORS

@@ -169 +169 @@
-
-N: Derk-Jan Hartman
-thedj@users.sourceforge.net
+hartman@videolan.org
-C: hartman
-D: Mac OS X interface

Makefile.am

@@ -508 +508 @@
-      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/`basename $${i}` ; \
-    done ; \
+    $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm
+    for i in $(srcdir)/share/http/vlm/* ; do \
+      $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \
+    done ; \
-    $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin
-    for i in $(srcdir)/share/http/admin/* ; do \

NEWS

@@ -7 +7 @@
- * Bookmarks feature for easier seeking/access inside medias.
- * Support for video output embedded in interfaces.
-http daemon.
+HTTP daemon
-
-Codecs:
- * New Continuous Media Markup Language (CMML) codec.
-   (http://www.annodex.net/overview.html)
-h
+H.
- * Packetizer interfaced between demux and codec when needed
-   (allows using ffmpeg plugin to decode MPEG streams and better aac decoding).
-
-Input:
-
-
-
+
+
+
+
- * New "file-cat" option to play truncated movies.
- * Better handling of meta info (title, author, description, etc...).
- * New options to pass meta info to the input.
-
+
+
+
+
+
-
-Stream output:
- * Improved session announcement system.
-e
+
- * Added faster than realtime stream output (limited by CPU) for file output.
- * Improved MOV/MP4 muxer.
@@ -37 +42 @@
- * New videolan (media) manager (vlm): a little manager designed to launch
-   and manage multiple streams from within one instance of VLC.
+ * Supports live streams and VoD.
+ * Supports scheduling.
- * Telnet interface for vlm.
-ttp
+TTP
-
-Interfaces:
@@ -48 +55 @@
-    - New design and set of icons.
-    - Ability to embed video output.
+
+Mac OS X port:
+ * Support for 'groups' and playlist item properties.
+ * OpenGL video output is now the default when available.
-
-Win32 port:

extras/contrib/src/Makefile

@@ -679 +679 @@
-# ***************************************************************************
-
-dj
-DJ
-
-dj
+macosx-altivec-bin
+
+
+mascosx-altivec-bin
-    $(EXTRACT_GZ)
-
@@ -691 +691 @@
-CLEAN_FILE += .goom
-CLEAN_PKG += goom
-dj
+macosx-altivec-bin
-
-# ***************************************************************************

extras/contrib/src/packages.mak

@@ -25 +25 @@
-GNU=http://ftp.gnu.org/pub/gnu
-SF=http://heanet.dl.sourceforge.net/sourceforge
-testing/contrib
+videolan
-AUTOCONF_VERSION=2.58
-AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
@@ -55 +55 @@
-VORBIS_VERSION=1.0
-VORBIS_URL=http://www.xiph.org/ogg/vorbis/download/libvorbis-$(VORBIS_VERSION).tar.gz
-#VORBIS_URL=$(VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
-THEORA_VERSION=1.0alpha2
-THEORA_URL=http://www.theora.org/files/libtheora-$(THEORA_VERSION).tar.gz
@@ -63 +62 @@
-SPEEX_URL=http://www.speex.org/download/speex-$(SPEEX_VERSION).tar.gz
-FAAD2_VERSION=2.0
-
+testing/contrib/
-FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
-LAME_VERSION=3.93.1
@@ -77 +76 @@
-OPENSLP_URL=$(SF)/openslp/openslp-$(OPENSLP_VERSION).tar.gz
-LIBDVDCSS_VERSION=1.2.8
-http://download.videolan.org/pub
+$(VIDEOLAN)
-LIBDVDREAD_VERSION=0.9.4
-LIBDVDREAD_URL=http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
-LIBDVDPLAY_VERSION=1.0.1
-http://download.videolan.org/pub
+$(VIDEOLAN)
-LIBDVDNAV_VERSION=0.1.9
-LIBDVDNAV_URL=http://ftp.snt.utwente.nl/pub/linux/gentoo/distfiles/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
-LIBDVBPSI_VERSION=0.1.4
-http://download.videolan.org/pub
+$(VIDEOLAN)
-LIVEDOTCOM_VERSION=2004.04.09
-http://download.videolan.org/pub
-DJ_URL=http://sidekick.student.utwente.nl/videolan/goom-dj
+$(VIDEOLAN)
+_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin
-LIBCACA_VERSION=0.9
-LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
-LIBDTS_VERSION=0.0.2
-http://download.videolan.org/pub/videolan
+$(VIDEOLAN)
-MODPLUG_VERSION=0.7
-http://download.videolan.org/pub/videolan
+$(VIDEOLAN)/testing
-MASH_VERSION=5.2
-MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz

modules/gui/macosx/macosx.m

@@ -60 +60 @@
-        "to fill the entire window." )
-
-OPENGL_TEXT N_("Use OpenGL
-OPENGL_LONGTEXT N_("Use OpenGL instead of QuickTime to
-render the video on the screen
+MACOSX_VOUT_TEXT N_("Force a video rendering mode.
+MACOSX_VOUT_LONGTEXT N_("The default method is OpenGL
+for Quartz Extreme machines and Quartz for the others
-
-#define OPENGL_EFFECT_TEXT N_("OpenGL effect")
@@ -78 +78 @@
-static char * effect_list_text[] = { N_("None"), N_("Cube"),
-                                     N_("Transparent cube") };
+
+static char *ppsz_vout_list[] = { "auto", "quartz", "opengl" };
+static char *ppsz_vout_list_text[] = { N_("Auto"), "Quartz", "OpenGL" };
-    
-vlc_module_begin();
@@ -92 +95 @@
-        add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL,
-                OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE );
-
-
+
+
+
-        add_string( "macosx-opengl-effect", "none", NULL,
-                    OPENGL_EFFECT_TEXT, OPENGL_EFFECT_LONGTEXT,

modules/gui/macosx/vout.m

@@ -92 +92 @@
-    OSErr err;
-    int i_timeout;
+    char *psz_vout_type;
-
-    p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
@@ -147 +148 @@
-
-    /* Check if we should use QuickTime or OpenGL */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if( !p_vout->p_sys->i_opengl )
-    {
@@ -191 +206 @@
-            return VLC_EGENERIC;        
-        }
+        msg_Dbg( p_vout, "using Quartz mode" );
+    }
+    else
+    {
+        msg_Dbg( p_vout, "using OpenGL mode" );
-    }
-
@@ -1507 +1527 @@
-        NSOpenGLPFAFullScreen,
-        NSOpenGLPFAScreenMask,
-x
+
-        CGDisplayIDToOpenGLDisplayMask( kCGDirectMainDisplay ),
-        0