Ignore:
Timestamp:
May 27, 2013, 3:28:05 PM (12 years ago)
Author:
Silvan Scherrer
Message:

SMPlayer: update trunk to 0.8.5

Location:
smplayer/trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • smplayer/trunk

  • smplayer/trunk/src/skingui/actiontools.cpp

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify

  • smplayer/trunk/src/skingui/actiontools.h

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify

  • smplayer/trunk/src/skingui/mediabarpanel.cpp

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44
    … …  
    5454
    5555        connect(volumeControlPanel, SIGNAL(volumeChanged(int)), this, SIGNAL(volumeChanged(int)));
     56        connect(volumeControlPanel, SIGNAL(volumeSliderMoved(int)), this, SIGNAL(volumeSliderMoved(int)));
    5657        connect(mediaPanel, SIGNAL(seekerChanged(int)), this, SIGNAL(seekerChanged(int)));
    5758}
    … …  
    99100    connect( core, SIGNAL(showTime(double)), this, SLOT(gotCurrentTime(double)) );
    100101    connect( core, SIGNAL(mediaInfoChanged()), this, SLOT(updateMediaInfo()) );
    101     /* connect( core, SIGNAL(buffering()), this, SLOT(setBuffering()) ); */
     102    connect( core, SIGNAL(buffering()), this, SLOT(setBuffering()) );
    102103}
    103104
    … …  
    119120void MediaBarPanel::updateMediaInfo()
    120121{
    121     mediaPanel->setMediaLabelText(core->mdat.displayName());
     122    QString s = QString("%1 (%2x%3)").arg(core->mdat.displayName()).arg(core->mdat.video_width).arg(core->mdat.video_height);
     123    mediaPanel->setMediaLabelText(s);
    122124}
    123125

  • smplayer/trunk/src/skingui/mediabarpanel.h

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44
    … …  
    7373signals:
    7474        void volumeChanged(int);
     75        void volumeSliderMoved(int);
    7576        void seekerChanged(int);
    7677};

  • smplayer/trunk/src/skingui/mediapanel.cpp

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/mediapanel.h

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/mybutton.cpp

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/mybutton.h

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/myicon.cpp

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/myicon.h

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/panelseeker.cpp

    r139 r142  
    4141    setState(Stopped, true);     
    4242    setTracking(pref->update_while_seeking);
    43     connect(this, SIGNAL(valueChanged(int)), this, SLOT(moved(int)));   
     43    connect(this, SIGNAL(valueChanged(int)), this, SLOT(moved(int)));
    4444    setRange(0, 100);
    4545    freezeTimer = new QTimer(this);

  • smplayer/trunk/src/skingui/playcontrol.cpp

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/playcontrol.h

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/qpropertysetter.cpp

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/qpropertysetter.h

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44

  • smplayer/trunk/src/skingui/skingui.cpp

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify
    … …  
    297297
    298298        connect(mediaBarPanel, SIGNAL(volumeChanged(int)), core, SLOT(setVolume(int)));
     299        connect(mediaBarPanel, SIGNAL(volumeSliderMoved(int)), core, SLOT(setVolume(int)));
    299300        connect(core, SIGNAL(volumeChanged(int)), mediaBarPanel, SLOT(setVolume(int)));
    300301

  • smplayer/trunk/src/skingui/skingui.h

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33
    44    This program is free software; you can redistribute it and/or modify

  • smplayer/trunk/src/skingui/volumecontrolpanel.cpp

    r139 r142  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
     2    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
    33    umplayer, Copyright (C) 2010 Ori Rejwan
    44
    … …  
    7272
    7373        connect(volumeBar, SIGNAL(valueChanged(int)), this, SIGNAL(volumeChanged(int)));
     74        connect(volumeBar, SIGNAL(sliderMoved(int)), this, SIGNAL(volumeSliderMoved(int)));
    7475}
    7576

  • smplayer/trunk/src/skingui/volumecontrolpanel.h

    r139 r142  
    6969signals:
    7070        void volumeChanged(int);
     71        void volumeSliderMoved(int);
    7172
    7273public slots:
Note: See TracChangeset for help on using the changeset viewer.