extremely limited speed support implemented #120

ui/labelslider.cpp

@@ -21,6 +21,7 @@ LabelSlider::LabelSlider(QWidget* parent) : QLabel(parent) {
 	set_value(0, false);
 	set = false;
 	display_type = LABELSLIDER_NORMAL;
+	decimal_places = 1;
 }
 
 void LabelSlider::set_display_type(int type) {
@@ -54,9 +55,9 @@ bool LabelSlider::is_dragging() {
 QString LabelSlider::valueToString(double v) {
 	switch (display_type) {
 	case LABELSLIDER_FRAMENUMBER: return frame_to_timecode(v, config.timecode_view, sequence->frame_rate);
-	case LABELSLIDER_PERCENT: return QString::number(v, 'f', 1) + "%";
+	case LABELSLIDER_PERCENT: return QString::number(v, 'f', decimal_places) + "%";
 	}
-	return QString::number(v, 'f', 1);
+	return QString::number(v, 'f', decimal_places);
 }
 
 double LabelSlider::getPreviousValue() {

ui/labelslider.h

@@ -24,6 +24,7 @@ public:
 	bool is_dragging();
 	virtual QString valueToString(double v);
 	double getPreviousValue();
+	int decimal_places;
 protected:
     void mousePressEvent(QMouseEvent *ev);
     void mouseMoveEvent(QMouseEvent *ev);

ui/timelinewidget.cpp

@@ -329,6 +329,7 @@ void TimelineWidget::dropEvent(QDropEvent* event) {
             c->timeline_in = g.in;
             c->timeline_out = g.out;
             c->clip_in = g.clip_in;
+			c->track = g.track;
             if (c->media_type == MEDIA_TYPE_FOOTAGE) {
                 Media* m = static_cast<Media*>(c->media);
                 if (m->video_tracks.size() == 0) {
@@ -347,6 +348,9 @@ void TimelineWidget::dropEvent(QDropEvent* event) {
                     c->color_g = 128;
                     c->color_b = 192;
                 }
+				if (c->track < 0) {
+					c->frame_rate = m->get_stream_from_file_index(true, c->media_stream)->video_frame_rate;
+				}
                 c->name = m->name;
             } else if (c->media_type == MEDIA_TYPE_SEQUENCE) {
                 // sequence (red?ish?)
@@ -354,11 +358,11 @@ void TimelineWidget::dropEvent(QDropEvent* event) {
                 c->color_g = 128;
                 c->color_b = 128;
 
-                c->name = static_cast<Sequence*>(c->media)->name;
+				Sequence* media = static_cast<Sequence*>(c->media);
+				c->frame_rate = media->frame_rate;
+				c->name = media->name;
             }
 
-            c->track = g.track;
-
             added_clips.append(c);
 		}
 
@@ -617,11 +621,13 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
 						c->color_b = 64;
 						c->track = g.track;
 
+						if (c->track < 0) c->frame_rate = sequence->frame_rate;
+
 						QVector<Clip*> add;
 						add.append(c);
                         ca->append(new AddClipCommand(sequence, add));
 
-                        int clipIndex = sequence->clips.size();
+//                        int clipIndex = sequence->clips.size();
 						if (c->track < 0) {
 							// default video effects (before custom effects)
                             c->effects.append(create_effect(VIDEO_TRANSFORM_EFFECT, c));