[svn r536] Reverted changes on GMythFile* inheritance. trunk
authorrosfran
Thu Apr 12 14:59:21 2007 +0100 (2007-04-12)
branchtrunk
changeset 53181cdff5d7452
parent 530 ad51640dd2cd
child 532 ba3564c925f3
[svn r536] Reverted changes on GMythFile* inheritance.
gst-plugins-mythtv/src/gstmythtvsrc.c
gst-plugins-mythtv/src/gstmythtvsrc.h
     1.1 --- a/gst-plugins-mythtv/src/gstmythtvsrc.c	Thu Apr 12 14:58:13 2007 +0100
     1.2 +++ b/gst-plugins-mythtv/src/gstmythtvsrc.c	Thu Apr 12 14:59:21 2007 +0100
     1.3 @@ -346,10 +346,10 @@
     1.4     * Retry whilst authentication fails and we supply it. */
     1.5  
     1.6    while (sizetoread == size && --max_iters > 0) {
     1.7 -    if ( gmyth_backend_info_is_local_file(src->backend_info) )
     1.8 +    /*if ( gmyth_backend_info_is_local_file(src->backend_info) )
     1.9        result = gmyth_file_local_read ( GMYTH_FILE_LOCAL(src->file_transfer),
    1.10            data_ptr, sizetoread, src->live_tv);      
    1.11 -    else
    1.12 +    else*/
    1.13        result = gmyth_file_transfer_read ( GMYTH_FILE_TRANSFER(src->file_transfer),
    1.14            data_ptr, sizetoread, src->live_tv);
    1.15  
    1.16 @@ -611,10 +611,10 @@
    1.17    /* verify if it needs to seek */
    1.18    if (src->read_offset != actual_seek) {
    1.19      
    1.20 -    if ( gmyth_backend_info_is_local_file(src->backend_info) )
    1.21 +    /*if ( gmyth_backend_info_is_local_file(src->backend_info) )
    1.22        new_offset =
    1.23            gmyth_file_local_seek (src->file_transfer, segment->start, G_SEEK_SET);
    1.24 -    else      
    1.25 +    else*/      
    1.26        new_offset =
    1.27            gmyth_file_transfer_seek (src->file_transfer, segment->start, SEEK_SET);
    1.28  
    1.29 @@ -712,14 +712,14 @@
    1.30  		}
    1.31    } else {
    1.32  
    1.33 -    if ( gmyth_uri_is_local_file(gmyth_uri) )
    1.34 +    /*if ( gmyth_uri_is_local_file(gmyth_uri) )
    1.35      {
    1.36        src->file_transfer = gmyth_file_local_new(src->backend_info);
    1.37        ret = gmyth_file_local_open (src->file_transfer);
    1.38 -    } else {
    1.39 +    } else {*/
    1.40        src->file_transfer = gmyth_file_transfer_new(src->backend_info);
    1.41        ret = gmyth_file_transfer_open (src->file_transfer, src->uri_name);
    1.42 -    }
    1.43 +    //}
    1.44  
    1.45    } /* if (else) - recorded FileTransfer */
    1.46  
     2.1 --- a/gst-plugins-mythtv/src/gstmythtvsrc.h	Thu Apr 12 14:58:13 2007 +0100
     2.2 +++ b/gst-plugins-mythtv/src/gstmythtvsrc.h	Thu Apr 12 14:59:21 2007 +0100
     2.3 @@ -58,7 +58,7 @@
     2.4    GstPushSrc element;
     2.5  
     2.6    /* MythFileTransfer */
     2.7 -  GMythFile *file_transfer;
     2.8 +  GMythFileTransfer *file_transfer;
     2.9  
    2.10    GMythLiveTV *spawn_livetv;
    2.11