# HG changeset patch # User rosfran # Date 1176386361 -3600 # Node ID 81cdff5d74528837b8cb34d96db5f5c9aadf4ad5 # Parent ad51640dd2cd15a5d1c8dc18aa4bb207c54a131c [svn r536] Reverted changes on GMythFile* inheritance. diff -r ad51640dd2cd -r 81cdff5d7452 gst-plugins-mythtv/src/gstmythtvsrc.c --- a/gst-plugins-mythtv/src/gstmythtvsrc.c Thu Apr 12 14:58:13 2007 +0100 +++ b/gst-plugins-mythtv/src/gstmythtvsrc.c Thu Apr 12 14:59:21 2007 +0100 @@ -346,10 +346,10 @@ * Retry whilst authentication fails and we supply it. */ while (sizetoread == size && --max_iters > 0) { - if ( gmyth_backend_info_is_local_file(src->backend_info) ) + /*if ( gmyth_backend_info_is_local_file(src->backend_info) ) result = gmyth_file_local_read ( GMYTH_FILE_LOCAL(src->file_transfer), data_ptr, sizetoread, src->live_tv); - else + else*/ result = gmyth_file_transfer_read ( GMYTH_FILE_TRANSFER(src->file_transfer), data_ptr, sizetoread, src->live_tv); @@ -611,10 +611,10 @@ /* verify if it needs to seek */ if (src->read_offset != actual_seek) { - if ( gmyth_backend_info_is_local_file(src->backend_info) ) + /*if ( gmyth_backend_info_is_local_file(src->backend_info) ) new_offset = gmyth_file_local_seek (src->file_transfer, segment->start, G_SEEK_SET); - else + else*/ new_offset = gmyth_file_transfer_seek (src->file_transfer, segment->start, SEEK_SET); @@ -712,14 +712,14 @@ } } else { - if ( gmyth_uri_is_local_file(gmyth_uri) ) + /*if ( gmyth_uri_is_local_file(gmyth_uri) ) { src->file_transfer = gmyth_file_local_new(src->backend_info); ret = gmyth_file_local_open (src->file_transfer); - } else { + } else {*/ src->file_transfer = gmyth_file_transfer_new(src->backend_info); ret = gmyth_file_transfer_open (src->file_transfer, src->uri_name); - } + //} } /* if (else) - recorded FileTransfer */ diff -r ad51640dd2cd -r 81cdff5d7452 gst-plugins-mythtv/src/gstmythtvsrc.h --- a/gst-plugins-mythtv/src/gstmythtvsrc.h Thu Apr 12 14:58:13 2007 +0100 +++ b/gst-plugins-mythtv/src/gstmythtvsrc.h Thu Apr 12 14:59:21 2007 +0100 @@ -58,7 +58,7 @@ GstPushSrc element; /* MythFileTransfer */ - GMythFile *file_transfer; + GMythFileTransfer *file_transfer; GMythLiveTV *spawn_livetv;