p_update->release.psz_url = NULL;
p_update->release.psz_desc = NULL;
+ p_update->p_download = NULL;
+ p_update->p_check = NULL;
+
p_update->p_pkey = NULL;
vlc_gcrypt_init();
{
assert( p_update );
+ vlc_mutex_lock( &p_update->lock );
+
+ if( p_update->p_check )
+ {
+ assert( !p_update->p_download );
+ vlc_object_kill( p_update->p_check );
+ vlc_thread_join( p_update->p_check );
+ }
+ else if( p_update->p_download )
+ {
+ vlc_object_kill( p_update->p_download );
+ vlc_thread_join( p_update->p_download );
+ }
+
+ vlc_mutex_unlock( &p_update->lock );
vlc_mutex_destroy( &p_update->lock );
free( p_update->release.psz_url );
return false;
}
-
-/**
- * Struct to launch the check in an other thread
- */
-typedef struct
-{
- VLC_COMMON_MEMBERS
- update_t *p_update;
- void (*pf_callback)( void *, bool );
- void *p_data;
-} update_check_thread_t;
-
-void update_CheckReal( update_check_thread_t *p_uct );
+static void update_CheckReal( update_check_thread_t *p_uct );
/**
* Check for updates
if( !p_uct ) return;
p_uct->p_update = p_update;
+ p_update->p_check = p_uct;
p_uct->pf_callback = pf_callback;
p_uct->p_data = p_data;
if( p_uct->pf_callback )
(p_uct->pf_callback)( p_uct->p_data, b_ret );
+
+ p_uct->p_update->p_check = NULL;
+
+ vlc_object_release( p_uct );
}
/**
return i_retval == -1 ? NULL : psz_tmp;
}
-
-/**
- * Struct to launch the download in a thread
- */
-typedef struct
-{
- VLC_COMMON_MEMBERS
- update_t *p_update;
- char *psz_destdir;
-} update_download_thread_t;
-
-void update_DownloadReal( update_download_thread_t *p_udt );
+static void update_DownloadReal( update_download_thread_t *p_udt );
/**
* Download the file given in the update_t
return;
p_udt->p_update = p_update;
+ p_update->p_download = p_udt;
p_udt->psz_destdir = psz_destdir ? strdup( psz_destdir ) : NULL;
vlc_thread_create( p_udt, "download update", update_DownloadReal,
VLC_THREAD_PRIORITY_LOW, false );
}
-void update_DownloadReal( update_download_thread_t *p_udt )
+static void update_DownloadReal( update_download_thread_t *p_udt )
{
int i_progress = 0;
long int l_size;
free( psz_destfile );
free( p_buffer );
free( psz_size );
+
+ p_udt->p_update->p_download = NULL;
+
+ vlc_object_release( p_udt );
}
update_release_t *update_GetRelease( update_t *p_update )
typedef struct public_key_t public_key_t;
+/**
+ * Non blocking binary download
+ */
+typedef struct
+{
+ VLC_COMMON_MEMBERS
+ update_t *p_update;
+ char *psz_destdir;
+} update_download_thread_t;
+
+/**
+ * Non blocking update availability verification
+ */
+typedef struct
+{
+ VLC_COMMON_MEMBERS
+ update_t *p_update;
+ void (*pf_callback)( void *, bool );
+ void *p_data;
+} update_check_thread_t;
/**
* The update object. Stores (and caches) all information relative to updates
*/
vlc_mutex_t lock;
struct update_release_t release; ///< Release (version)
public_key_t *p_pkey;
+ update_download_thread_t *p_download;
+ update_check_thread_t *p_check;
};