Changeset 45c3c5f4c0d8413799253968f4210cc6f5cc776c

Timestamp:

10/08/08 23:10:28 (4 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1218402628 +0200

git-parent:

[e7d43dd44d9b2de967c8a8097f3eeb7e3d914c2e]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1218402628 +0200

Message:

update: Various fixes to make it work on Mac OS X.

Files:

• include/vlc_update.h (modified) (1 diff)
• modules/gui/macosx/update.m (modified) (2 diffs)
• src/libvlccore.sym (modified) (1 diff)
• src/misc/update.c (modified) (6 diffs)

include/vlc_update.h

@@ -60 +60 @@
-VLC_EXPORT( void, update_Download, ( update_t *, const char* ) );
-VLC_EXPORT( update_release_t*, update_GetRelease, ( update_t * ) );
+VLC_EXPORT( void, update_WaitDownload, ( update_t * ) );
-
-/**

modules/gui/macosx/update.m

@@ -152 +152 @@
-    {
-        /* perform download and pass the selected path */
-self performDownload: 
+NSThread detachNewThreadSelector:@selector(performDownload:) toTarget:self withObject:
-    }
-    [sheet release];
@@ -216 +216 @@
-- (void)performDownload:(NSString *)path
-{
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    update_Download( p_u, [path UTF8String] );
-    [o_btn_DownloadNow setEnabled: NO];
-    [o_update_window orderOut: self];
+    update_WaitDownload( p_u );
-    update_Delete( p_u );
-    p_u = nil;
+    [pool release];
-}
-

src/libvlccore.sym

@@ -363 +363 @@
-update_NeedUpgrade
-__update_New
+update_WaitDownload
-us_atof
-us_strtod

src/misc/update.c

@@ -1457 +1457 @@
-}
-
+void update_WaitDownload( update_t *p_update )
+{
+    if(p_update->p_download)
+        vlc_thread_join( p_update->p_download );
+    vlc_object_release( p_update->p_download );
+    p_update->p_download = NULL;
+}
+
-static void* update_DownloadReal( vlc_object_t *p_this );
-
@@ -1505 +1513 @@
-    char *psz_destdir = p_udt->psz_destdir;
-
+    msg_Dbg( p_udt, "Opening Stream '%s'", p_update->release.psz_url );
+
-    /* Open the stream */
-    p_stream = stream_UrlNew( p_udt, p_update->release.psz_url );
@@ -1537 +1547 @@
-    p_buffer = (void *)malloc( 1 << 10 );
-    if( !p_buffer )
+    {
+        msg_Err( p_udt, "Can't malloc (1 << 10) bytes! download cancelled." );
-        goto end;
+    }
+
+    msg_Dbg( p_udt, "Downloading Stream '%s'", p_update->release.psz_url );
-
-    psz_size = size_str( l_size );
@@ -1586 +1601 @@
-        {
-            intf_ProgressUpdate( p_udt, i_progress, psz_status, 100.0, 0 );
+            i_progress = 0;
-            free( psz_status );
-        }
@@ -1675 +1691 @@
-
-end:
+    if( i_progress )
+    {
+        intf_ProgressUpdate( p_udt, i_progress, "Cancelled", 100.0, 0 );
+    }
-    if( p_stream )
-        stream_Delete( p_stream );
@@ -1716 +1736 @@
-}
-
+void update_WaitDownload( update_t *p_update )
+{
+    (void)p_update;
+}
+
-void update_Download( update_t *p_update, const char *psz_destdir )
-{