Ticket #9258: music-dechndlr.diff
File music-dechndlr.diff, 2.1 KB (added by , 13 years ago) |
---|
-
mythplugins/mythmusic/mythmusic/decoderhandler.cpp
267 267 m_redirects = 0; 268 268 269 269 QUrl url; 270 if (mdata->Filename().startsWith('/')) 270 // NB Win32 absolute paths start d:/... 271 if (QFileInfo(mdata->Filename()).isAbsolute()) 271 272 url = QUrl::fromLocalFile(mdata->Filename()); 272 273 else 273 274 url.setUrl(mdata->Filename()); … … 328 329 PlayListFileEntry *entry = m_playlist.get(m_playlist_pos); 329 330 330 331 QUrl url; 331 if (entry->File().startsWith('/')) 332 // NB Win32 absolute paths start d:/... 333 if (QFileInfo(entry->File()).isAbsolute()) 332 334 url = QUrl::fromLocalFile(entry->File()); 333 335 else 334 336 url.setUrl(entry->File()); … … 398 400 399 401 if (extension == ".pls" || extension == ".m3u") 400 402 { 401 if (url.scheme() == "file" || url.toString().startsWith('/')) 403 // NB Win32 absolute paths start d:/... 404 if (url.scheme() == "file" || QFileInfo(url.toString()).isAbsolute()) 402 405 return createPlaylistFromFile(url); 403 406 else 404 407 return createPlaylistFromRemoteUrl(url); … … 411 414 { 412 415 PlayListFileEntry *entry = new PlayListFileEntry; 413 416 414 if (url.scheme() == "file" || url.toString().startsWith('/')) 417 // NB Win32 absolute paths start d:/... 418 if (url.scheme() == "file" || QFileInfo(url.toString()).isAbsolute()) 415 419 entry->setFile(url.toLocalFile()); 416 420 else 417 421 entry->setFile(url.toString()); … … 513 517 if (haveIOFactory()) 514 518 deleteIOFactory(); 515 519 516 if (url.scheme() == "file" || url.toString().startsWith('/') || url.toString().endsWith(".cda")) 520 // NB Win32 absolute paths start d:/... 521 if (url.scheme() == "file" || QFileInfo(url.toString()).isAbsolute() || url.toString().endsWith(".cda")) 517 522 m_io_factory = new DecoderIOFactoryFile(this); 518 523 else if (m_meta && m_meta->Format() == "cast") 519 524 m_io_factory = new DecoderIOFactoryShoutCast(this);