Ignore:
Timestamp:
Oct 9, 2014, 2:54:21 PM (11 years ago)
Author:
Silvan Scherrer
Message:

SMPlayer: updated trunk to 14.9.0

Location:
smplayer/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • smplayer/trunk

  • smplayer/trunk/src/playlist.cpp

    r165 r170  
    972972        QString filename = core->mdat.filename;
    973973        double duration = core->mdat.duration;
     974        QString artist = core->mdat.clip_artist;
     975
    974976        QString name = core->mdat.clip_name;
    975         QString artist = core->mdat.clip_artist;
     977        if (name.isEmpty()) name = core->mdat.stream_title;
    976978
    977979        #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
     
    994996        PlaylistItemList::iterator it;
    995997        for ( it = pl.begin(); it != pl.end(); ++it ) {
     998                /* qDebug("Playlist:: getMediaInfo: f1: %s f2: %s", (*it).filename().toUtf8().constData(), filename.toUtf8().constData()); */
    996999                if ( (*it).filename() == filename ) {
     1000                        /* qDebug("Playlist:: getMediaInfo: duration: %f", (*it).duration()); */
    9971001                        if ((*it).duration()<1) {
    9981002                                if (!name.isEmpty()) {
     
    13471351        files = Helper::resolveSymlinks(files); // Check for Windows shortcuts
    13481352        #endif
     1353        files.sort();
    13491354
    13501355        QStringList only_files;
Note: See TracChangeset for help on using the changeset viewer.