Ignore:
Timestamp:
May 16, 2014, 9:51:55 AM (11 years ago)
Author:
Silvan Scherrer
Message:

SMPlayer: update trunk to latest 0.8.7

Location:
smplayer/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • smplayer/trunk

  • smplayer/trunk/src/qtsingleapplication/qtlocalpeer.cpp

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
    5 **
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
    7 **
    8 ** This file is part of a Qt Solutions component.
    9 **
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
     5**
     6** This file is part of the Qt Solutions component.
     7**
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
    3736**
     37** $QT_END_LICENSE$
     38**
    3839****************************************************************************/
    3940
    4041
    4142#include "qtlocalpeer.h"
    42 #include <QtCore/QCoreApplication>
    43 #include <QtCore/QTime>
    44 
    45 #if defined(Q_OS_WIN)
    46 #include <QtCore/QLibrary>
    47 #include <QtCore/qt_windows.h>
     43#include <QCoreApplication>
     44#include <QTime>
     45
     46#if defined(Q_OS_WIN)
     47#include <QLibrary>
     48#include <qt_windows.h>
    4849typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
    4950static PProcessIdToSessionId pProcessIdToSessionId = 0;
    5051#endif
    5152#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
     53#include <sys/types.h>
    5254#include <time.h>
    5355#include <unistd.h>
    … …  
    196198    socket->write(ack, qstrlen(ack));
    197199    socket->waitForBytesWritten(1000);
     200    socket->waitForDisconnected(1000); // make sure client reads ack
    198201    delete socket;
    199202    emit messageReceived(message); //### (might take a long time to return)

  • smplayer/trunk/src/qtsingleapplication/qtlocalpeer.h

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    55**
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
     6** This file is part of the Qt Solutions component.
    77**
    8 ** This file is part of a Qt Solutions component.
    9 **
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
    3736**
     37** $QT_END_LICENSE$
     38**
    3839****************************************************************************/
    3940
    … …  
    4142#define QTLOCALPEER_H
    4243
    43 #include <QtNetwork/QLocalServer>
    44 #include <QtNetwork/QLocalSocket>
    45 #include <QtCore/QDir>
     44#include <QLocalServer>
     45#include <QLocalSocket>
     46#include <QDir>
    4647
    4748#include "qtlockedfile.h"

  • smplayer/trunk/src/qtsingleapplication/qtlockedfile.cpp

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    55**
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
     6** This file is part of the Qt Solutions component.
    77**
    8 ** This file is part of a Qt Solutions component.
    9 **
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3534** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
     36**
     37** $QT_END_LICENSE$
    3738**
    3839****************************************************************************/

  • smplayer/trunk/src/qtsingleapplication/qtlockedfile.h

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    55**
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
     6** This file is part of the Qt Solutions component.
    77**
    8 ** This file is part of a Qt Solutions component.
    9 **
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
    3736**
     37** $QT_END_LICENSE$
     38**
    3839****************************************************************************/
    3940
    … …  
    4142#define QTLOCKEDFILE_H
    4243
    43 #include <QtCore/QFile>
     44#include <QFile>
    4445#ifdef Q_OS_WIN
    45 #include <QtCore/QVector>
     46#include <QVector>
    4647#endif
    4748
    48 #if defined(Q_WS_WIN)
     49#if defined(Q_OS_WIN)
    4950#  if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT)
    5051#    define QT_QTLOCKEDFILE_EXPORT

  • smplayer/trunk/src/qtsingleapplication/qtlockedfile_unix.cpp

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    55**
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
     6** This file is part of the Qt Solutions component.
    77**
    8 ** This file is part of a Qt Solutions component.
    9 **
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3534** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
     36**
     37** $QT_END_LICENSE$
    3738**
    3839****************************************************************************/

  • smplayer/trunk/src/qtsingleapplication/qtlockedfile_win.cpp

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
    5 **
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
    7 **
    8 ** This file is part of a Qt Solutions component.
    9 **
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
     5**
     6** This file is part of the Qt Solutions component.
     7**
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
    3736**
     37** $QT_END_LICENSE$
     38**
    3839****************************************************************************/
    3940
    4041#include "qtlockedfile.h"
    4142#include <qt_windows.h>
    42 #include <QtCore/QFileInfo>
     43#include <QFileInfo>
    4344
    4445#define MUTEX_PREFIX "QtLockedFile mutex "
    4546// Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS
    4647#define MAX_READERS MAXIMUM_WAIT_OBJECTS
     48
     49#if QT_VERSION >= 0x050000
     50#define QT_WA(unicode, ansi) unicode
     51#endif
    4752
    4853Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate)

  • smplayer/trunk/src/qtsingleapplication/qtsingleapplication.cpp

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
    5 **
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
    7 **
    8 ** This file is part of a Qt Solutions component.
    9 **
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
     5**
     6** This file is part of the Qt Solutions component.
     7**
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
    3736**
     37** $QT_END_LICENSE$
     38**
    3839****************************************************************************/
    3940
    … …  
    4142#include "qtsingleapplication.h"
    4243#include "qtlocalpeer.h"
    43 #include <QtGui/QWidget>
     44#include <QWidget>
    4445
    4546
    … …  
    170171}
    171172
     173#if QT_VERSION < 0x050000
    172174
    173175/*!
    … …  
    183185
    184186
    185 #if defined(Q_WS_X11)
     187#  if defined(Q_WS_X11)
    186188/*!
    187189  Special constructor for X11, ref. the documentation of
    … …  
    221223    sysInit(appId);
    222224}
    223 #endif
     225#  endif // Q_WS_X11
     226#endif // QT_VERSION < 0x050000
    224227
    225228

  • smplayer/trunk/src/qtsingleapplication/qtsingleapplication.h

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    55**
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
     6** This file is part of the Qt Solutions component.
    77**
    8 ** This file is part of a Qt Solutions component.
    9 **
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
    3736**
     37** $QT_END_LICENSE$
     38**
    3839****************************************************************************/
    3940
    … …  
    4142#define QTSINGLEAPPLICATION_H
    4243
    43 #include <QtGui/QApplication>
     44#include <QApplication>
    4445
    4546class QtLocalPeer;
    4647
    47 #if defined(Q_WS_WIN)
     48#if defined(Q_OS_WIN)
    4849#  if !defined(QT_QTSINGLEAPPLICATION_EXPORT) && !defined(QT_QTSINGLEAPPLICATION_IMPORT)
    4950#    define QT_QTSINGLEAPPLICATION_EXPORT
    … …  
    6869    QtSingleApplication(int &argc, char **argv, bool GUIenabled = true);
    6970    QtSingleApplication(const QString &id, int &argc, char **argv);
     71#if QT_VERSION < 0x050000
    7072    QtSingleApplication(int &argc, char **argv, Type type);
    71 #if defined(Q_WS_X11)
     73#  if defined(Q_WS_X11)
    7274    QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
    7375    QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0);
    7476    QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
    75 #endif
     77#  endif // Q_WS_X11
     78#endif // QT_VERSION < 0x050000
    7679
    7780    bool isRunning();

  • smplayer/trunk/src/qtsingleapplication/qtsingleapplication.pri

    r128 r165  
    33DEPENDPATH += $$PWD
    44QT *= network
     5greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
    56
    67qtsingleapplication-uselib:!qtsingleapplication-buildlib {

  • smplayer/trunk/src/qtsingleapplication/qtsinglecoreapplication.cpp

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    55**
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
     6** This file is part of the Qt Solutions component.
    77**
    8 ** This file is part of a Qt Solutions component.
    9 **
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3534** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
     36**
     37** $QT_END_LICENSE$
    3738**
    3839****************************************************************************/

  • smplayer/trunk/src/qtsingleapplication/qtsinglecoreapplication.h

    r128 r165  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
     3** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    55**
    6 ** Contact: Nokia Corporation (qt-info@nokia.com)
     6** This file is part of the Qt Solutions component.
    77**
    8 ** This file is part of a Qt Solutions component.
    9 **
     8** $QT_BEGIN_LICENSE:BSD$
    109** You may use this file under the terms of the BSD license as follows:
    1110**
    … …  
    1918**     the documentation and/or other materials provided with the
    2019**     distribution.
    21 **   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
    22 **     the names of its contributors may be used to endorse or promote
    23 **     products derived from this software without specific prior written
    24 **     permission.
     20**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
     21**     of its contributors may be used to endorse or promote products derived
     22**     from this software without specific prior written permission.
     23**
    2524**
    2625** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    3635** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
    3736**
     37** $QT_END_LICENSE$
     38**
    3839****************************************************************************/
    3940
    … …  
    4142#define QTSINGLECOREAPPLICATION_H
    4243
    43 #include <QtCore/QCoreApplication>
     44#include <QCoreApplication>
    4445
    4546class QtLocalPeer;
Note: See TracChangeset for help on using the changeset viewer.