Ignore:
Timestamp:
May 3, 2016, 5:25:45 PM (9 years ago)
Author:
Silvan Scherrer
Message:

smplayer: update trunk to version 16.4

Location:
smplayer/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • smplayer/trunk

  • smplayer/trunk/src/filesettings.cpp

    r165 r176  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify
     
    6161}
    6262
    63 void FileSettings::loadSettingsFor(QString filename, MediaSettings & mset) {
     63void FileSettings::loadSettingsFor(QString filename, MediaSettings & mset, int player) {
    6464        qDebug("FileSettings::loadSettingsFor: '%s'", filename.toUtf8().constData());
    6565
     
    6969
    7070        mset.reset();
     71
    7172        my_settings->beginGroup( group_name );
    72         mset.load(my_settings);
     73        mset.load(my_settings, player);
    7374        my_settings->endGroup();
    7475}
    7576
    76 void FileSettings::saveSettingsFor(QString filename, MediaSettings & mset) {
     77void FileSettings::saveSettingsFor(QString filename, MediaSettings & mset, int player) {
    7778        qDebug("FileSettings::saveSettingsFor: '%s'", filename.toUtf8().constData());
    7879
     
    8384        my_settings->beginGroup( group_name );
    8485        my_settings->setValue("saved", true);
    85         mset.save(my_settings);
     86        mset.save(my_settings, player);
    8687        my_settings->endGroup();
    8788}
Note: See TracChangeset for help on using the changeset viewer.