further progress on footage viewer

panels/effectcontrols.cpp

@@ -30,6 +30,7 @@ EffectControls::EffectControls(QWidget *parent) :
     init_effects();
 	init_transitions();
     clear_effects(false);
+	ui->headers->viewer = panel_sequence_viewer;
 	ui->headers->snapping = false;
 
 	ui->effects_area->parent_widget = ui->scrollArea;
@@ -45,9 +46,6 @@ EffectControls::EffectControls(QWidget *parent) :
 	connect(ui->verticalScrollBar, SIGNAL(valueChanged(int)), ui->keyframeView, SLOT(set_y_scroll(int)));
 	connect(ui->verticalScrollBar, SIGNAL(valueChanged(int)), ui->scrollArea->verticalScrollBar(), SLOT(setValue(int)));
 	connect(ui->scrollArea->verticalScrollBar(), SIGNAL(valueChanged(int)), ui->verticalScrollBar, SLOT(setValue(int)));
-
-	/*connect(ui->keyframeScroller->verticalScrollBar(), SIGNAL(valueChanged(int)), ui->scrollArea->verticalScrollBar(), SLOT(setValue(int)));
-	connect(ui->keyframeScroller->horizontalScrollBar(), SIGNAL(valueChanged(int)), ui->headers, SLOT(set_scroll(int)));*/
 }
 
 EffectControls::~EffectControls() {

panels/panels.cpp

@@ -62,7 +62,7 @@ void update_effect_controls() {
 
 void update_ui(bool modified) {
 	if (modified) {
-		panel_sequence_viewer->reset_all_audio();
+//		panel_sequence_viewer->reset_all_audio();
 		update_effect_controls();
 	}
 	panel_effect_controls->update_keyframes();

panels/timeline.cpp

@@ -184,14 +184,6 @@ int Timeline::calculate_track_height(int track, int value) {
     return vector.at(index);
 }
 
-void Timeline::set_in_point() {
-	ui->headers->set_in_point(sequence->playhead);
-}
-
-void Timeline::set_out_point() {
-	ui->headers->set_out_point(sequence->playhead);
-}
-
 void Timeline::update_sequence() {
     bool null_sequence = (sequence == NULL);
 
@@ -315,7 +307,8 @@ void Timeline::delete_selection(bool ripple_delete) {
                     if (!deleted) {
                         for (int j=0;j<sequence->clips.size();j++) {
                             Clip* cc = sequence->clips.at(j);
-                            if (cc->track == c->track
+							if (cc != NULL
+									&& cc->track == c->track
                                     && cc->timeline_in > c->timeline_out
                                     && cc->timeline_in < c->timeline_out + ripple_length) {
                                 ripple_length = cc->timeline_in - c->timeline_out;

panels/timeline.h

@@ -92,8 +92,6 @@ public:
     bool has_clip_been_split(int c);
     void toggle_links();
     void ripple_to_in_point(bool in);
-    void set_in_point();
-    void set_out_point();
     void delete_in_out(bool ripple);
 	void previous_cut();
 	void next_cut();

panels/viewer.cpp

@@ -52,7 +52,11 @@ Viewer::Viewer(QWidget *parent) :
 }
 
 Viewer::~Viewer() {
-    delete ui;
+	delete ui;
+}
+
+bool Viewer::is_focused() {
+	return ui->headers->hasFocus() || ui->openGLWidget->hasFocus();
 }
 
 void Viewer::set_main_sequence() {
@@ -140,7 +144,7 @@ QString frame_to_timecode(long f, int view, double frame_rate) {
 }
 
 bool frame_rate_is_droppable(float rate) {
-    return (rate == 23.976f || rate == 29.97f || rate == 59.94f);
+	return (qFuzzyCompare(rate, 23.976f) || qFuzzyCompare(rate, 29.97f) || qFuzzyCompare(rate, 59.94f));
 }
 
 void Viewer::seek(long p) {
@@ -204,10 +208,6 @@ void Viewer::update_end_timecode() {
 void Viewer::update_header_zoom() {
 	if (seq != NULL) {
 		long sequenceEndFrame = seq->getEndFrame();
-		if (sequenceEndFrame > 0) {
-			ui->headers->update_zoom((double) ui->headers->width() / (double) sequenceEndFrame);
-		} else {
-		}
 		ui->headers->update_zoom((sequenceEndFrame > 0) ? ((double) ui->headers->width() / (double) sequenceEndFrame) : 1);
 	}
 }
@@ -224,6 +224,17 @@ void Viewer::update_viewer() {
 	viewer_widget->update();
 	update_header_zoom();
 	if (seq != NULL) update_playhead_timecode(seq->playhead);
+	update_end_timecode();
+}
+
+void Viewer::set_in_point() {
+	qDebug() << "in h";
+	ui->headers->set_in_point(seq->playhead);
+}
+
+void Viewer::set_out_point() {
+	qDebug() << "out h";
+	ui->headers->set_out_point(seq->playhead);
 }
 
 void Viewer::set_media(int type, void* media) {
@@ -242,7 +253,8 @@ void Viewer::set_media(int type, void* media) {
 			MediaStream* video_stream = footage->video_tracks.at(0);
 			seq->width = video_stream->video_width;
 			seq->height = video_stream->video_height;
-			seq->frame_rate = video_stream->video_frame_rate;
+			if (video_stream->video_frame_rate > 0) seq->frame_rate = video_stream->video_frame_rate;
+			qDebug() << seq->frame_rate << video_stream->video_frame_rate;
 
 			Clip* c = new Clip(seq);
 			c->media = footage;

panels/viewer.h

@@ -23,6 +23,7 @@ public:
 	explicit Viewer(QWidget *parent = 0);
 	~Viewer();
 
+	bool is_focused();
     void set_main_sequence();
     void set_media(int type, void* media);
 	void compose();
@@ -31,6 +32,8 @@ public:
     void update_end_timecode();
 	void update_header_zoom();
 	void update_viewer();
+	void set_in_point();
+	void set_out_point();
 
 	// playback functions
 	void go_to_start();