X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Findexfile.C;h=eb9184f91a7e589e7582d979195997eefe5eda0e;hb=6fae7dd0f56872d524c1a6cf749a15574783f9e8;hp=a5f12bcaaa1dda0272fbe9da5a485a172c82b4d3;hpb=28600526f736ffd4f104f29495a4bb36497e1ea8;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/indexfile.C b/cinelerra-5.1/cinelerra/indexfile.C index a5f12bca..eb9184f9 100644 --- a/cinelerra-5.1/cinelerra/indexfile.C +++ b/cinelerra-5.1/cinelerra/indexfile.C @@ -103,12 +103,12 @@ static int udf_volume_id(const char *path, char *fname) if( strncmp(ISO_STANDARD_ID,id.id,sizeof(id.id)) ) continue; // look for volume_id if( !isalnum(id.volume_id[0]) ) continue; - char *bp = &id.volume_id[0], *cp = fname; + char *bp = (char*)&id.volume_id[0], *cp = fname; for( int i=0; i<(int)sizeof(id.volume_id); ++i ) *cp++ = *bp++; while( --cp>=fname && *cp==' ' ) *cp = 0; if( !*fname ) continue; // fname = volume_id _ creation_date - ++cp; *cp++ = '_'; bp = &id.creation_date[0]; + ++cp; *cp++ = '_'; bp = (char*)&id.creation_date[0]; for( int i=0; i<(int)sizeof(id.creation_date)-1; ++i ) { if( !isdigit(*bp) ) break; *cp++ = *bp++; @@ -141,7 +141,6 @@ IndexFile::IndexFile(MWindow *mwindow, this->mwindow = mwindow; this->indexable = indexable; redraw_timer = new Timer; - if(indexable) { indexable->add_user(); @@ -433,6 +432,9 @@ SET_TRACE // open the source file if(open_source()) return 1; + source_channels = indexable->get_audio_channels(); + source_samplerate = indexable->get_sample_rate(); + source_length = indexable->get_audio_samples(); SET_TRACE