aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/qmmp/Output/oss/outputoss.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/qmmp/Output/oss/outputoss.cpp b/lib/qmmp/Output/oss/outputoss.cpp
index ccc5eace4..63faf5c10 100644
--- a/lib/qmmp/Output/oss/outputoss.cpp
+++ b/lib/qmmp/Output/oss/outputoss.cpp
@@ -19,9 +19,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-
-#include <qobject.h>
-#include <qapplication.h>
+#include <QApplication>
#include "outputoss.h"
#include "constants.h"
@@ -72,7 +70,6 @@ void OutputOSS::seek(long pos)
m_currentSeconds = -1;
}
-//#if defined(_OS_UNIX_) || defined(Q_OS_UNIX)
#include <unistd.h>
#include <fcntl.h>
@@ -80,7 +77,7 @@ void OutputOSS::seek(long pos)
#include <sys/time.h>
#if defined(__FreeBSD__)
-# include <machine/soundcard.h>
+# include <sys/soundcard.h>
#elif defined(__linux__)
# include <linux/soundcard.h>
#elif defined(__bsdi__)
00 committer trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> 2009-02-25 10:55:15 +0000 added projectm visual plugin (not ready yet)' href='/qmmp/commit/src/plugins/Visual/projectm/projectmwidget.h?id=d36f67b99809a6fd3ca88832a998a0a1fd0de890'>d36f67b99
4df23e9b8



d36f67b99



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68





















                                                                             

                    


               












                                              
                                 




                                                 











                                                      

        



                         



      
/***************************************************************************
 *   Copyright (C) 2009 by Ilya Kotov                                      *
 *   forkotov02@hotmail.ru                                                 *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 *   This program is distributed in the hope that it will be useful,       *
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 *   GNU General Public License for more details.                          *
 *                                                                         *
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program; if not, write to the                         *
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
#ifndef PROJECTMWIDGET_H
#define PROJECTMWIDGET_H

#include <QGLWidget>


class QMenu;
class projectM;


/**
    @author Ilya Kotov <forkotov02@hotmail.ru>
*/
class ProjectMWidget : public QGLWidget
{
    Q_OBJECT
public:
    ProjectMWidget(QWidget *parent = 0);

    ~ProjectMWidget();

    projectM *projectMInstance();

protected:
    virtual void initializeGL();
    virtual void resizeGL(int width, int height);
    virtual void paintGL();
    virtual void mousePressEvent (QMouseEvent *event);

private slots:
    void showHelp();
    void showPresetName();
    void showTitle();
    void nextPreset();
    void previousPreset();
    void randomPreset();
    void lockPreset();
    void fullScreen();
    void updateTitle();

private:
    projectM *m_projectM;
    QMenu *m_menu;
    void createActions();


};

#endif