1.1 --- a/libgnomevfs2-mythtv/modules/mythtv-method.c	Mon Oct 23 14:41:30 2006 +0100
     1.2 +++ b/libgnomevfs2-mythtv/modules/mythtv-method.c	Thu Nov 09 19:12:55 2006 +0000
     1.3 @@ -27,7 +27,7 @@
     1.4  #include <libgnomevfs/gnome-vfs-module.h>
     1.5  #include <libgnomevfs/gnome-vfs-utils.h>
     1.6  
     1.7 -#include "myth_file_transfer.h"
     1.8 +#include "gmyth_file_transfer.h"
     1.9  
    1.10  #define GST_MYTHTV_ID_NUM               1
    1.11  #define MYTHTV_VERSION_DEFAULT          30
    1.12 @@ -40,7 +40,7 @@
    1.13                                 GnomeVFSContext *context);
    1.14  
    1.15  typedef struct {
    1.16 -    MythFileTransfer *file_transfer;
    1.17 +    GMythFileTransfer *file_transfer;
    1.18      
    1.19      gint mythtv_version;
    1.20      guint64 content_size;
    1.21 @@ -94,7 +94,7 @@
    1.22      myth_handle->live_tv = FALSE;
    1.23  
    1.24      /* Connect to the backend */
    1.25 -    myth_handle->file_transfer = myth_file_transfer_new ( GST_MYTHTV_ID_NUM /*mythtv->live_tv_id*/,
    1.26 +    myth_handle->file_transfer = gmyth_file_transfer_new ( GST_MYTHTV_ID_NUM /*mythtv->live_tv_id*/,
    1.27          g_string_new( transfer_uri ), -1, myth_handle->mythtv_version );
    1.28  
    1.29      if ( myth_handle->file_transfer == NULL ) {
    1.30 @@ -102,14 +102,14 @@
    1.31      }
    1.32  
    1.33      /* sets the Playback monitor connection */
    1.34 -    ret = myth_file_transfer_playback_setup( &(myth_handle->file_transfer), myth_handle->live_tv );
    1.35 +    ret = gmyth_file_transfer_playback_setup( &(myth_handle->file_transfer), myth_handle->live_tv );
    1.36      if (ret == FALSE) {
    1.37          g_printerr ("Mythtv FileTransfer playback setup error\n");
    1.38  	return GNOME_VFS_ERROR_NOT_OPEN;
    1.39      }
    1.40        
    1.41      /* sets the FileTransfer instance connection (video/audio download) */
    1.42 -    ret = myth_file_transfer_setup( &(myth_handle->file_transfer), myth_handle->live_tv );
    1.43 +    ret = gmyth_file_transfer_setup( &(myth_handle->file_transfer), myth_handle->live_tv );
    1.44  
    1.45      if ( ret == FALSE ) {
    1.46        g_printerr ("MythTV FileTransfer request failed when setting up socket connection!\n" );
    1.47 @@ -156,7 +156,7 @@
    1.48  
    1.49      // lock here ???
    1.50      while ( bytes_to_read > 0 ) {
    1.51 -  	len = myth_file_transfer_read( myth_handle->file_transfer,
    1.52 +  	len = gmyth_file_transfer_read( myth_handle->file_transfer,
    1.53  			buffer + offset, bytes_to_read, TRUE );
    1.54  
    1.55          if ( len > 0 ) {