gui->flush();
}
-void MWindow::zoom_track(int64_t zoom_track)
+void MWindow::zoom_atrack(int64_t zoom)
{
-// scale waveforms
- edl->local_session->zoom_y = (int64_t)((float)edl->local_session->zoom_y *
- zoom_track /
- edl->local_session->zoom_track);
- CLAMP(edl->local_session->zoom_y, MIN_AMP_ZOOM, MAX_AMP_ZOOM);
-
-// scale tracks
- double scale = (double)zoom_track / edl->local_session->zoom_track;
- edl->local_session->zoom_track = zoom_track;
+ int64_t old_zoom = edl->local_session->zoom_atrack;
+ CLAMP(zoom, MIN_TRACK_ZOOM, MAX_TRACK_ZOOM);
+ edl->local_session->zoom_atrack = zoom;
+ edl->local_session->zoom_atrack = zoom;
+ for( Track *track= edl->tracks->first; track; track=track->next ) {
+ if( track->data_type != TRACK_AUDIO ) continue;
+ track->data_h = zoom;
+ }
// shift row position
- for(int i = 0; i < TOTAL_PANES; i++)
- {
- edl->local_session->track_start[i] *= scale;
+ for( int i=0; i<TOTAL_PANES; ++i ) edl->local_session->track_start[i] =
+ (edl->local_session->track_start[i] * zoom) / old_zoom;
+ edl->tracks->update_y_pixels(theme);
+ gui->draw_trackmovement();
+}
+
+void MWindow::zoom_vtrack(int64_t zoom)
+{
+ int64_t old_zoom = edl->local_session->zoom_vtrack;
+ CLAMP(zoom, MIN_TRACK_ZOOM, MAX_TRACK_ZOOM);
+ edl->local_session->zoom_vtrack = zoom;
+
+ for( Track *track= edl->tracks->first; track; track=track->next ) {
+ if( track->data_type != TRACK_VIDEO ) continue;
+ track->data_h = zoom;
}
+// shift row position
+ for( int i=0; i<TOTAL_PANES; ++i ) edl->local_session->track_start[i] =
+ (edl->local_session->track_start[i] * zoom) / old_zoom;
edl->tracks->update_y_pixels(theme);
gui->draw_trackmovement();
-//printf("MWindow::zoom_track %d %d\n", edl->local_session->zoom_y, edl->local_session->zoom_track);
}
void MWindow::trackmovement(int offset, int pane_number)
void MWindow::move_up(int64_t distance)
{
TimelinePane *pane = gui->get_focused_pane();
- if(distance == 0) distance = edl->local_session->zoom_track;
-
+ if(distance == 0) distance = pane->canvas->get_h() / 10;
trackmovement(-distance, pane->number);
}
void MWindow::move_down(int64_t distance)
{
TimelinePane *pane = gui->get_focused_pane();
- if(distance == 0) distance = edl->local_session->zoom_track;
-
+ if(distance == 0) distance = pane->canvas->get_h() / 10;
trackmovement(distance, pane->number);
}
TimelinePane *pane = gui->get_focused_pane();
int64_t old_view_start = edl->local_session->view_start[pane->number];
- if(edl->tracks->total_length() > (double)pane->canvas->get_w() *
- edl->local_session->zoom_sample /
- edl->session->sample_rate)
- {
+ if( edl->tracks->total_length() > (double)pane->canvas->get_w() *
+ edl->local_session->zoom_sample / edl->session->sample_rate ) {
edl->local_session->view_start[pane->number] =
Units::round(edl->tracks->total_length() *
edl->session->sample_rate /
{
TimelinePane *pane = gui->get_focused_pane();
if(!distance)
- distance = pane->canvas->get_w() /
- 10;
+ distance = pane->canvas->get_w() / 10;
edl->local_session->view_start[pane->number] -= distance;
samplemovement(edl->local_session->view_start[pane->number],
pane->number);
{
TimelinePane *pane = gui->get_focused_pane();
if(!distance)
- distance = pane->canvas->get_w() /
- 10;
+ distance = pane->canvas->get_w() / 10;
edl->local_session->view_start[pane->number] += distance;
samplemovement(edl->local_session->view_start[pane->number],
pane->number);
KeyFrame *keyframe = 0;
double start = edl->local_session->get_selectionstart(1);
double end = edl->local_session->get_selectionend(1);
- double position = dir == PLAY_FORWARD ? end : start, new_position = 0;
+ double position = dir == PLAY_FORWARD ? end : start;
+ double new_position = dir == PLAY_FORWARD ? start : end;
for( Track *track=edl->tracks->first; track; track=track->next ) {
- if( !track->record ) continue;
+ if( !track->is_armed() ) continue;
for( int i=0; i<track->plugin_set.size(); ++i ) {
PluginSet *plugin_set = track->plugin_set[i];
int64_t pos = track->to_units(position, 0);
return find_selection(new_position);
}
+int MWindow::nearest_auto_keyframe(int shift_down, int dir)
+{
+ Auto *keyframe = 0;
+ double start = edl->local_session->get_selectionstart(1);
+ double end = edl->local_session->get_selectionend(1);
+ double position = dir == PLAY_FORWARD ? end : start;
+ double new_position = dir == PLAY_FORWARD ? start : end;
+ for( Track *track=edl->tracks->first; track; track=track->next ) {
+ if( !track->is_armed() ) continue;
+ int64_t pos = track->to_units(position, 0);
+ for( int i=0; i<AUTOMATION_TOTAL; ++i ) {
+ Autos *autos = track->automation->autos[i];
+ if( !autos ) continue;
+ Auto *key = dir == PLAY_FORWARD ?
+ autos->nearest_after(pos) :
+ autos->nearest_before(pos);
+ if( !key ) continue;
+ double key_position = track->from_units(key->position);
+ if( keyframe && (dir == PLAY_FORWARD ?
+ key_position >= new_position :
+ new_position >= key_position ) ) continue;
+ keyframe = key; new_position = key_position;
+ }
+ }
+
+ new_position = keyframe ?
+ keyframe->autos->track->from_units(keyframe->position) :
+ dir == PLAY_FORWARD ? edl->tracks->total_length() : 0;
+
+ if( !shift_down )
+ start = end = new_position;
+ else if( dir == PLAY_FORWARD )
+ end = new_position;
+ else
+ start = new_position;
+
+ edl->local_session->set_selectionstart(start);
+ edl->local_session->set_selectionend(end);
+ return find_selection(new_position);
+}
+
int MWindow::find_selection(double position, int scroll_display)
{
update_plugin_guis();
int MWindow::expand_t()
{
- int result = edl->local_session->zoom_track * 2;
- result = MIN(result, MAX_TRACK_ZOOM);
- zoom_track(result);
+ int zoom = edl->local_session->zoom_atrack * 2;
+ zoom = MIN(zoom, MAX_TRACK_ZOOM);
+ zoom_atrack(zoom);
+ zoom = edl->local_session->zoom_vtrack * 2;
+ zoom = MIN(zoom, MAX_TRACK_ZOOM);
+ zoom_vtrack(zoom);
gui->zoombar->update();
return 0;
}
int MWindow::zoom_in_t()
{
- int result = edl->local_session->zoom_track / 2;
- result = MAX(result, MIN_TRACK_ZOOM);
- zoom_track(result);
+ int zoom = edl->local_session->zoom_atrack / 2;
+ zoom = MAX(zoom, MIN_TRACK_ZOOM);
+ zoom_atrack(zoom);
+ zoom = edl->local_session->zoom_vtrack / 2;
+ zoom = MAX(zoom, MIN_TRACK_ZOOM);
+ zoom_vtrack(zoom);
gui->zoombar->update();
return 0;
}
projects / goodguy / cinelerra.git / blobdiff