transcode: destroy spu on transcode_spu_close

[vlc] / modules / gui / macosx / about.m

diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index 92cc6d851a0020b4921f5db17322826e71f4502d..d56ed7f59ed5596f9c8194b6e5e57c188e56100b 100644 (file)
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * about.m: MacOS X About Panel
  *****************************************************************************
- * Copyright (C) 2001-2007 the VideoLAN team
+ * Copyright (C) 2001-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
- *          Felix Paul K\9fhne <fkuehne -at- videolan.org>
+ *          Felix Paul Kühne <fkuehne -at- videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,11 +31,11 @@
 #import <vlc_about.h>
 
 #ifdef __x86_64__
-#define PLATFORM "Intel"
+#define PLATFORM "Intel 64bit"
 #elif __i386__
-#define PLATFORM "Intel"
+#define PLATFORM "Intel 32bit"
 #else
-#define PLATFORM "PowerPC"
+#define PLATFORM "PowerPC 32bit"
 #endif
 
 /*****************************************************************************
@@ -61,6 +61,12 @@ static VLAboutBox *_o_sharedInstance = nil;
     return _o_sharedInstance;
 }
 
+- (void) dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
+    [super dealloc];
+}
+
 /*****************************************************************************
 * VLC About Window
 *****************************************************************************/
@@ -86,13 +92,8 @@ static VLAboutBox *_o_sharedInstance = nil;
         [o_about_window setTitle: _NS("About VLC media player")];
 
         /* setup the creator / revision field */
-        if( VLC_Changeset() != "exported" )
-            [o_revision_field setStringValue:
-                [NSString stringWithFormat: _NS("Compiled by %s, based on Git commit %s"),
-                    VLC_CompileBy(), VLC_Changeset()]];
-        else
-            [o_revision_field setStringValue: 
-                [NSString stringWithFormat: _NS("Compiled by %s"), VLC_CompileBy()]];
+        [o_revision_field setStringValue: 
+            [NSString stringWithFormat: _NS("Compiled by %s"), VLC_CompileBy()]];
  
         /* Setup the nameversion field */
         [o_name_version_field setStringValue: [NSString stringWithFormat:@"Version %s (%s)", VLC_Version(), PLATFORM]];
@@ -117,6 +118,7 @@ static VLAboutBox *_o_sharedInstance = nil;
  
     /* Show the window */
     b_restart = YES;
+    [o_credits_textview scrollPoint:NSMakePoint( 0, 0 )];
     [o_about_window makeKeyAndOrderFront: nil];
 }
 
@@ -139,7 +141,7 @@ static VLAboutBox *_o_sharedInstance = nil;
     if( b_restart )
     {
         /* Reset the starttime */
-        i_start = [NSDate timeIntervalSinceReferenceDate] + 3.0;
+        i_start = [NSDate timeIntervalSinceReferenceDate] + 5.0;
         f_current = 0;
         f_end = [o_credits_textview bounds].size.height - [o_credits_scrollview bounds].size.height;
         b_restart = NO;
@@ -156,6 +158,7 @@ static VLAboutBox *_o_sharedInstance = nil;
         /* If at end, restart at the top */
         if( f_current >= f_end )
         {
+            [o_credits_textview scrollPoint:NSMakePoint( 0, 0 )];
             b_restart = YES;
         }
     }
@@ -205,7 +208,7 @@ static VLAboutBox *_o_sharedInstance = nil;
 
 - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
 {
-    /* delegate to update button states (we're the frameLoadDelegate for our help's webview)« */
+    /* delegate to update button states (we're the frameLoadDelegate for our help's webview)« */
     [o_help_fwd_btn setEnabled: [o_help_web_view canGoForward]]; 
     [o_help_bwd_btn setEnabled: [o_help_web_view canGoBack]];
 }