diff --git a/data/themes/default/logo.svg b/data/themes/default/logo.svg
new file mode 100644
index 00000000000..f6479235e66
--- /dev/null
+++ b/data/themes/default/logo.svg
@@ -0,0 +1,1300 @@
+
+
+
+
diff --git a/plugins/Amplifier/lmmslogo.svg b/plugins/Amplifier/lmmslogo.svg
new file mode 100644
index 00000000000..f6479235e66
--- /dev/null
+++ b/plugins/Amplifier/lmmslogo.svg
@@ -0,0 +1,1300 @@
+
+
+
+
diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
index 2152c0cc1b1..af1060703fe 100644
--- a/src/tracks/SampleTrack.cpp
+++ b/src/tracks/SampleTrack.cpp
@@ -148,7 +148,7 @@ void SampleTCO::setSampleBuffer( SampleBuffer* sb )
void SampleTCO::setSampleFile( const QString & _sf )
{
m_sampleBuffer->setAudioFile( _sf );
- updateLength();
+ changeLength( (int) ( m_sampleBuffer->frames() / Engine::framesPerTick() ) );
emit sampleChanged();
emit playbackPositionChanged();
@@ -199,7 +199,7 @@ void SampleTCO::setIsPlaying(bool isPlaying)
void SampleTCO::updateLength()
{
- changeLength( sampleLength() );
+ emit sampleChanged();
}
@@ -505,12 +505,6 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
// disable antialiasing for borders, since its not needed
p.setRenderHint( QPainter::Antialiasing, false );
- if( r.width() < width() - 1 )
- {
- p.drawLine( r.x(), r.y() + r.height() / 2,
- rect().right() - TCO_BORDER_WIDTH, r.y() + r.height() / 2 );
- }
-
// inner border
p.setPen( c.lighter( 160 ) );
p.drawRect( 1, 1, rect().right() - TCO_BORDER_WIDTH,