aboutsummaryrefslogtreecommitdiff
path: root/src/app/builtincommandlineoption.h
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2014-03-11 11:07:31 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2014-03-11 11:07:31 +0000
commit1ee17de296f8e0c302be17842447b91ddbab7bc3 (patch)
tree4ef54d0dfb52323706507c2df42b0b2b59b949e1 /src/app/builtincommandlineoption.h
parentb1242b8a41e1053547e5e9e5069b5e09b3eacb28 (diff)
downloadqmmp-1ee17de296f8e0c302be17842447b91ddbab7bc3.tar.gz
qmmp-1ee17de296f8e0c302be17842447b91ddbab7bc3.tar.bz2
qmmp-1ee17de296f8e0c302be17842447b91ddbab7bc3.zip
added feature to add files from multiple instances (win32 only)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4145 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/app/builtincommandlineoption.h')
-rw-r--r--src/app/builtincommandlineoption.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/app/builtincommandlineoption.h b/src/app/builtincommandlineoption.h
index 257755ec1..64e1cfac4 100644
--- a/src/app/builtincommandlineoption.h
+++ b/src/app/builtincommandlineoption.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2012 by Ilya Kotov *
+ * Copyright (C) 2008-2014 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -23,6 +23,7 @@
#include <QObject>
#include <QHash>
#include <QStringList>
+#include <QTimer>
class PlayListModel;
@@ -49,10 +50,15 @@ public:
private slots:
void disconnectPl();
+ void addPendingPaths();
private:
QStringList m_options;
PlayListModel *m_model;
+ QStringList m_pending_path_list;
+#ifdef Q_OS_WIN
+ QTimer *m_timer;
+#endif
};
#endif