diff -r d5f5855e7800 -r ce823be21819 libgnomevfs2-mythtv/modules/mythtv-method.c --- a/libgnomevfs2-mythtv/modules/mythtv-method.c Mon Oct 23 14:41:30 2006 +0100 +++ b/libgnomevfs2-mythtv/modules/mythtv-method.c Thu Nov 09 19:12:55 2006 +0000 @@ -27,7 +27,7 @@ #include #include -#include "myth_file_transfer.h" +#include "gmyth_file_transfer.h" #define GST_MYTHTV_ID_NUM 1 #define MYTHTV_VERSION_DEFAULT 30 @@ -40,7 +40,7 @@ GnomeVFSContext *context); typedef struct { - MythFileTransfer *file_transfer; + GMythFileTransfer *file_transfer; gint mythtv_version; guint64 content_size; @@ -94,7 +94,7 @@ myth_handle->live_tv = FALSE; /* Connect to the backend */ - myth_handle->file_transfer = myth_file_transfer_new ( GST_MYTHTV_ID_NUM /*mythtv->live_tv_id*/, + myth_handle->file_transfer = gmyth_file_transfer_new ( GST_MYTHTV_ID_NUM /*mythtv->live_tv_id*/, g_string_new( transfer_uri ), -1, myth_handle->mythtv_version ); if ( myth_handle->file_transfer == NULL ) { @@ -102,14 +102,14 @@ } /* sets the Playback monitor connection */ - ret = myth_file_transfer_playback_setup( &(myth_handle->file_transfer), myth_handle->live_tv ); + ret = gmyth_file_transfer_playback_setup( &(myth_handle->file_transfer), myth_handle->live_tv ); if (ret == FALSE) { g_printerr ("Mythtv FileTransfer playback setup error\n"); return GNOME_VFS_ERROR_NOT_OPEN; } /* sets the FileTransfer instance connection (video/audio download) */ - ret = myth_file_transfer_setup( &(myth_handle->file_transfer), myth_handle->live_tv ); + ret = gmyth_file_transfer_setup( &(myth_handle->file_transfer), myth_handle->live_tv ); if ( ret == FALSE ) { g_printerr ("MythTV FileTransfer request failed when setting up socket connection!\n" ); @@ -156,7 +156,7 @@ // lock here ??? while ( bytes_to_read > 0 ) { - len = myth_file_transfer_read( myth_handle->file_transfer, + len = gmyth_file_transfer_read( myth_handle->file_transfer, buffer + offset, bytes_to_read, TRUE ); if ( len > 0 ) {