various improvements

panels/effectcontrols.cpp

@@ -89,7 +89,7 @@ void EffectControls::menu_select(QAction* q) {
 		panel_timeline->repaint_timeline(true);
 	} else {
 		reload_clips();
-		panel_viewer->viewer_widget->update();
+		panel_sequence_viewer->viewer_widget->update();
 	}
 }
 
@@ -229,7 +229,7 @@ void EffectControls::delete_effects() {
     }
     if (command->clips.size() > 0) {
         undo_stack.push(command);
-		panel_viewer->viewer_widget->update();
+		panel_sequence_viewer->viewer_widget->update();
     } else {
         delete command;
     }

panels/panels.cpp

@@ -2,5 +2,5 @@
 
 Project* panel_project = 0;
 EffectControls* panel_effect_controls = 0;
-Viewer* panel_viewer = 0;
+Viewer* panel_sequence_viewer = 0;
 Timeline* panel_timeline = 0;

panels/panels.h

@@ -8,7 +8,7 @@ class Timeline;
 
 extern Project* panel_project;
 extern EffectControls* panel_effect_controls;
-extern Viewer* panel_viewer;
+extern Viewer* panel_sequence_viewer;
 extern Timeline* panel_timeline;
 
 #endif // PANELS_H

panels/timeline.cpp

@@ -193,13 +193,13 @@ void Timeline::play() {
     start_msecs = QDateTime::currentMSecsSinceEpoch();
 	playback_updater.start();
     playing = true;
-    panel_viewer->set_playpause_icon(false);
+	panel_sequence_viewer->set_playpause_icon(false);
 	audio_thread->notifyReceiver();
 }
 
 void Timeline::pause() {
 	playing = false;
-    panel_viewer->set_playpause_icon(true);
+	panel_sequence_viewer->set_playpause_icon(true);
 	playback_updater.stop();
 }
 
@@ -296,7 +296,7 @@ void Timeline::repaint_timeline(bool changed) {
 	if (changed) {
 		reset_all_audio();
 		update_effect_controls();
-		if (!playing) panel_viewer->viewer_widget->update();
+		if (!playing) panel_sequence_viewer->viewer_widget->update();
 	} else if (playing) {
 		sequence->playhead = round(playhead_start + ((QDateTime::currentMSecsSinceEpoch()-start_msecs) * 0.001 * sequence->frame_rate));
 	}
@@ -310,7 +310,7 @@ void Timeline::repaint_timeline(bool changed) {
 		panel_timeline->ui->horizontalScrollBar->setMaximum(qMax(0, getScreenPointFromFrame(panel_timeline->zoom, sequence->getEndFrame()) + 100 - ui->editAreas->width()));
 
 		if (last_frame != sequence->playhead) {
-			panel_viewer->viewer_widget->update();
+			panel_sequence_viewer->viewer_widget->update();
 			ui->audio_monitor->update();
 			last_frame = sequence->playhead;
 		}
@@ -323,7 +323,7 @@ void Timeline::repaint_timeline(bool changed) {
 			ui->horizontalScrollBar->setValue(target_scroll);
 		}
 
-		panel_viewer->update_playhead_timecode(sequence->playhead);
+		panel_sequence_viewer->update_playhead_timecode(sequence->playhead);
 	}
 }
 

panels/viewer.cpp

@@ -6,6 +6,7 @@
 #include "project/sequence.h"
 #include "panels/panels.h"
 #include "io/config.h"
+#include "io/media.h"
 
 #define FRAMES_IN_ONE_MINUTE 1798 // 1800 - 2
 #define FRAMES_IN_TEN_MINUTES 17978 // (FRAMES_IN_ONE_MINUTE * 10) - 2
@@ -23,7 +24,7 @@ Viewer::Viewer(QWidget *parent) :
 	ui->setupUi(this);
 	ui->glViewerPane->child = ui->openGLWidget;
     viewer_widget = ui->openGLWidget;
-    update_sequence();
+	update_media(MEDIA_TYPE_SEQUENCE, NULL);
 
 	ui->currentTimecode->set_default_value(qSNaN());
 	ui->currentTimecode->set_value(0, false);
@@ -117,39 +118,47 @@ void Viewer::update_end_timecode() {
     }
 }
 
-/*void Viewer::update_media(int type) {
+void Viewer::update_media(int type, void* media) {
+	switch (type) {
+	case MEDIA_TYPE_FOOTAGE:
+	{
+	}
+		break;
+	case MEDIA_TYPE_SEQUENCE:
+	{
+		Sequence* s = static_cast<Sequence*>(media);
 
-}*/
+		bool null_sequence = (s == NULL);
 
-void Viewer::update_sequence() {
-    bool null_sequence = (sequence == NULL);
+		ui->openGLWidget->setEnabled(!null_sequence);
+		ui->openGLWidget->setVisible(!null_sequence);
+		ui->pushButton->setEnabled(!null_sequence);
+		ui->pushButton_2->setEnabled(!null_sequence);
+		ui->pushButton_3->setEnabled(!null_sequence);
+		ui->pushButton_4->setEnabled(!null_sequence);
+		ui->pushButton_5->setEnabled(!null_sequence);
 
-    ui->openGLWidget->setEnabled(!null_sequence);
-    ui->openGLWidget->setVisible(!null_sequence);
-    ui->pushButton->setEnabled(!null_sequence);
-    ui->pushButton_2->setEnabled(!null_sequence);
-    ui->pushButton_3->setEnabled(!null_sequence);
-    ui->pushButton_4->setEnabled(!null_sequence);
-    ui->pushButton_5->setEnabled(!null_sequence);
+		init_audio();
 
-    init_audio();
+		if (!null_sequence) {
+			config.timecode_view = (frame_rate_is_droppable(s->frame_rate)) ? TIMECODE_DROP : TIMECODE_NONDROP;
 
-    if (!null_sequence) {
-		config.timecode_view = (frame_rate_is_droppable(sequence->frame_rate)) ? TIMECODE_DROP : TIMECODE_NONDROP;
+			update_playhead_timecode(s->playhead);
+			update_end_timecode();
 
-		update_playhead_timecode(sequence->playhead);
-        update_end_timecode();
+			ui->glViewerPane->aspect_ratio = (float) s->width / (float) s->height;
+			ui->glViewerPane->adjust();
+		} else {
+			update_playhead_timecode(0);
+			update_end_timecode();
+		}
 
-        ui->glViewerPane->aspect_ratio = (float) sequence->width / (float) sequence->height;
-        ui->glViewerPane->adjust();
-    } else {
-        update_playhead_timecode(0);
-        update_end_timecode();
-    }
+		viewer_widget->update();
 
-	viewer_widget->update();
-
-    update();
+		update();
+	}
+		break;
+	}
 }
 
 void Viewer::on_pushButton_clicked()

panels/viewer.h

@@ -21,7 +21,7 @@ class Viewer : public QDockWidget
 public:
 	explicit Viewer(QWidget *parent = 0);
 	~Viewer();
-    void update_sequence();
+	void update_media(int type, void* media);
 	void compose();
     void set_playpause_icon(bool play);
     void update_playhead_timecode(long p);