Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* fix up unc path splitting

* try setting volume after setting output device.

git-svn-id: svn+ssh://svn.last.fm/svn/clientside/trunk/desktop@123155 ab8f4a45-97f9-0310-bbd1-854ce3dcee89
  • Loading branch information...
commit a22423f4946bfc63afb6493ea8f51343f4c4f251 1 parent 998cf68
@dougma dougma authored
View
3  app/boffin/App.cpp
@@ -87,7 +87,6 @@ App::init( MainWindow* window ) throw( int /*exitcode*/ )
////// radio
QString const name = QSettings().value( OUTPUT_DEVICE_KEY ).toString();
m_audioOutput = new Phonon::AudioOutput( Phonon::MusicCategory, this );
- m_audioOutput->setVolume( 1.0 /* Settings().volume() */ );
QActionGroup* actiongroup = new QActionGroup( window->ui.outputdevice );
@@ -103,6 +102,8 @@ App::init( MainWindow* window ) throw( int /*exitcode*/ )
actiongroup->addAction( a );
}
+ m_audioOutput->setVolume( 1.0 /* Settings().volume() */ );
+
connect( actiongroup, SIGNAL(triggered( QAction* )), SLOT(onOutputDeviceActionTriggered( QAction* )) );
m_pipe = new MediaPipeline( m_audioOutput, this );
View
11 app/clientplugins/localresolver/LocalContentConfigurator.cpp
@@ -79,8 +79,15 @@ splitPath(const QString& p)
QString volume, path;
if (!err) {
- volume = getVolumeName( wcscat(drive, L"\\") );
- path = removeLeadingSlash( QString::fromUtf16( dir ) );
+ if (0 == wcslen(drive)) {
+ // no drive letter, it's a UNC.
+ volume = QString::fromWCharArray( dir );
+ path = "";
+ } else {
+ // convert drive letter -> volume name
+ volume = getVolumeName( wcscat(drive, L"\\") );
+ path = removeLeadingSlash( QString::fromUtf16( dir ) );
+ }
}
return QPair<QString, QString>( volume, path );
Please sign in to comment.
Something went wrong with that request. Please try again.