projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ffmpeg scan remap fix, configure.ac all or none fix, 3rd party libs: ffmpeg, turbo...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
indexfile.C
diff --git
a/cinelerra-5.1/cinelerra/indexfile.C
b/cinelerra-5.1/cinelerra/indexfile.C
index 3e1ce389fa7ae911af92717c78f18e5aefd9982d..b8c0af6957a57b2c7eb96df02678e5977e24a8cb 100644
(file)
--- a/
cinelerra-5.1/cinelerra/indexfile.C
+++ b/
cinelerra-5.1/cinelerra/indexfile.C
@@
-70,19
+70,22
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_ISOFS
#include <linux/iso_fs.h>
#include <linux/iso_fs.h>
+#endif
// check for isofs volume_id for dvd/cdrom
static int udf_volume_id(const char *path, char *fname)
{
// check for isofs volume_id for dvd/cdrom
static int udf_volume_id(const char *path, char *fname)
{
+ int result = 1;
+#ifdef HAVE_ISOFS
struct stat st;
if( stat(path,&st) ) return 1;
// search mounted devices
FILE *fp = fopen("/proc/mounts","r");
if( !fp ) return 1;
struct stat st;
if( stat(path,&st) ) return 1;
// search mounted devices
FILE *fp = fopen("/proc/mounts","r");
if( !fp ) return 1;
- int result = 1;
while( result && !feof(fp) && !ferror(fp) ) {
char devpath[BCTEXTLEN], mpath[BCTEXTLEN];
char options[BCTEXTLEN], line[BCTEXTLEN];
while( result && !feof(fp) && !ferror(fp) ) {
char devpath[BCTEXTLEN], mpath[BCTEXTLEN];
char options[BCTEXTLEN], line[BCTEXTLEN];
@@
-122,6
+125,7
@@
static int udf_volume_id(const char *path, char *fname)
}
fclose(fp);
}
fclose(fp);
+#endif
return result;
}
return result;
}
@@
-232,6
+236,15
@@
void IndexFile::delete_index(Preferences *preferences,
remove_file(index_filename);
}
remove_file(index_filename);
}
+void IndexFile::delete_index_files(Preferences *preferences,
+ Indexable *indexable)
+{
+ delete_index(preferences, indexable, ".toc");
+ delete_index(preferences, indexable, ".idx");
+ delete_index(preferences, indexable, ".mkr");
+}
+
+
int IndexFile::open_file()
{
int result = 0;
int IndexFile::open_file()
{
int result = 0;
@@
-361,9
+374,10
@@
void IndexFile::close_source()
delete render_engine;
render_engine = 0;
delete render_engine;
render_engine = 0;
-
- delete cache;
- cache = 0;
+ if( cache ) {
+ cache->remove_user();
+ cache = 0;
+ }
}
int64_t IndexFile::get_required_scale()
}
int64_t IndexFile::get_required_scale()
@@
-694,10
+708,9
@@
SET_TRACE
// Start and length of fragment to read from file in bytes.
float *buffer = 0;
int buffer_shared = 0;
// Start and length of fragment to read from file in bytes.
float *buffer = 0;
int buffer_shared = 0;
- int rect_audio = mwindow->preferences->rectify_audio;;
- int center_pixel = !rect_audio ?
- mwindow->edl->local_session->zoom_track / 2 :
- mwindow->edl->local_session->zoom_track;
+ int rect_audio = mwindow->preferences->rectify_audio;
+ int data_h = edit->track->data_h;
+ int center_pixel = !rect_audio ? data_h/2 : data_h;
if( edit->track->show_titles() )
center_pixel += mwindow->theme->get_image("title_bg_data")->get_h();
if( edit->track->show_titles() )
center_pixel += mwindow->theme->get_image("title_bg_data")->get_h();
@@
-734,9
+747,9
@@
SET_TRACE
int prev_y1 = center_pixel;
int prev_y2 = center_pixel;
int first_frame = 1;
int prev_y1 = center_pixel;
int prev_y2 = center_pixel;
int first_frame = 1;
- int zoom_y =
!rect_audio ?
- mwindow->edl->local_session->zoom_y / 2 :
-
mwindow->edl->local_session->zoom_y
;
+ int zoom_y =
mwindow->edl->local_session->zoom_y * data_h /
+ mwindow->edl->local_session->zoom_atrack;
+
if( !rect_audio ) zoom_y /= 2
;
int max_y = center_pixel + zoom_y - 1;
edit_position = (x + pixmap->pixmap_x - virtual_edit_x) * project_zoom;
int64_t speed_position = edit->startsource;
int max_y = center_pixel + zoom_y - 1;
edit_position = (x + pixmap->pixmap_x - virtual_edit_x) * project_zoom;
int64_t speed_position = edit->startsource;
@@
-777,7
+790,7
@@
SET_TRACE
// A different algorithm has to be used if it's 1 sample per pixel and the
// index is used. Now the min and max values are equal so we join the max samples.
if(mwindow->edl->local_session->zoom_sample == 1) {
// A different algorithm has to be used if it's 1 sample per pixel and the
// index is used. Now the min and max values are equal so we join the max samples.
if(mwindow->edl->local_session->zoom_sample == 1) {
- canvas->draw_line(x2 - 1, !rect_audio ? prev_y1 : center_pixel, x2, y1, pixmap);
+ canvas->draw_
b
line(x2 - 1, !rect_audio ? prev_y1 : center_pixel, x2, y1, pixmap);
}
else {
// Extend line height if it doesn't connect to previous line
}
else {
// Extend line height if it doesn't connect to previous line
@@
-788,7
+801,7
@@
SET_TRACE
else {
first_frame = 0;
}
else {
first_frame = 0;
}
- canvas->draw_line(x2, y1, x2, !rect_audio ? y2 : center_pixel, pixmap);
+ canvas->draw_
b
line(x2, y1, x2, !rect_audio ? y2 : center_pixel, pixmap);
}
prev_y1 = next_y1;
prev_y2 = next_y2;
}
prev_y1 = next_y1;
prev_y2 = next_y2;