upplay / Code / Diff of /GUI/mainw/mainw.h

Diff of /GUI/mainw/mainw.h [ea731d] .. [8c7b8c]

Switch to unified view


...
class GUI_Playlist;
class GUI_Library_windowed;
class GUI_InfoDialog;
class GUI_LibraryPath;
class GUI_Notifications;



class QTemporaryFile;

class GUI_Player : public QMainWindow {
    Q_OBJECT
public:
    explicit GUI_Player(QTranslator* translator, QWidget *parent = 0);
    ~GUI_Player();

public slots:

    void really_close(bool=false);
    void trayItemActivated (QSystemTrayIcon::ActivationReason reason);

    // For restoring from settings
    void setVolume(int vol);
    
    // Reflect externally triggered audio changes in ui
    void update_track(const MetaData& in);
    void setCurrentPosition(quint32 pos_sec);






    void stopped();
    void playing();
    void paused();


    void setVolumeUi(int volume_percent);
    void setMuteUi(bool);

    void setRendererName(const QString& nm);

...
    void sig_preferences();

private slots:
    // These are connected to ui signals (either tray or main ctl),
    // and coordinate stuff.
    void onPlayActivated();
    void onPauseActivated();
    void onStopActivated();
    void onBackwardActivated();
    void onForwardActivated();
    void onJumpForwardActivated();
    void onJumpBackwardActivated();
    void onMuteActivated(bool);
    void onVolumeStepActivated(int val);

    void onVolumeHigherActivated();
    void onVolumeLowerActivated();

    /* File */

    /* View */
    void showLibrary(bool, bool resize=true);
...
    GUI_Playlist*           ui_playlist;
    GUI_Library_windowed*   ui_library;
    GUI_LibraryPath*        ui_libpath;
    GUI_InfoDialog*         ui_info_dialog;
    GUI_Notifications*      ui_notifications;


    QNetworkAccessManager  *m_netmanager;


    QString                 m_class_name;
    QString                 m_renderer_friendly_name;

    GUI_TrayIcon *          m_trayIcon;

    QString                 m_skinSuffix;

    MetaData            m_metadata;

    bool                m_metadata_available;
    bool                m_overridemin2tray;

    int                 m_library_width;
    int                 m_library_stretch_factor;

	a/GUI/mainw/mainw.h		b/GUI/mainw/mainw.h
	...		...
38	class GUI_Playlist;	38	class GUI_Playlist;
39	class GUI_Library_windowed;	39	class GUI_Library_windowed;
40	class GUI_InfoDialog;	40	class GUI_InfoDialog;
41	class GUI_LibraryPath;	41	class GUI_LibraryPath;
42	class GUI_Notifications;	42	class GUI_Notifications;
43	class GUI_Startup_Dialog;
44	class CoverLookup;
45	class GUI_Alternate_Covers;
46	class QTemporaryFile;	43	class QTemporaryFile;
47		44
48	class GUI_Player : public QMainWindow {	45	class GUI_Player : public QMainWindow {
49	Q_OBJECT	46	Q_OBJECT
50	public:	47	public:
51	explicit GUI_Player(QTranslator* translator, QWidget *parent = 0);	48	explicit GUI_Player(QTranslator* translator, QWidget *parent = 0);
52	~GUI_Player();	49	~GUI_Player();
53		50
54	public slots:	51	public slots:
55		52
		53	void really_close(bool=false);
		54	void trayItemActivated (QSystemTrayIcon::ActivationReason reason);
		55
		56	// For restoring from settings
		57	void setVolume(int vol);
		58
		59	// Reflect externally triggered audio changes in ui
56	void update_track(const MetaData& in);	60	void update_track(const MetaData& in);
57	void setCurrentPosition(quint32 pos_sec);	61	void setCurrentPosition(quint32 pos_sec);
58
59	void really_close(bool=false);
60
61	void trayItemActivated (QSystemTrayIcon::ActivationReason reason);
62
63	// Reflect externally triggered audio changes in ui
64	void stopped();	62	void stopped();
65	void playing();	63	void playing();
66	void paused();	64	void paused();
67
68	void setVolume(int vol);
69	void setVolumeUi(int volume_percent);	65	void setVolumeUi(int volume_percent);
70	void setMuteUi(bool);	66	void setMuteUi(bool);
71		67
72	void setRendererName(const QString& nm);	68	void setRendererName(const QString& nm);
73		69
	...		...
96	void sig_preferences();	92	void sig_preferences();
97		93
98	private slots:	94	private slots:
99	// These are connected to ui signals (either tray or main ctl),	95	// These are connected to ui signals (either tray or main ctl),
100	// and coordinate stuff.	96	// and coordinate stuff.
101	void playClicked();	97	void onPlayActivated();
102	void pauseClicked();	98	void onPauseActivated();
103	void stopClicked();	99	void onStopActivated();
104	void backwardClicked();	100	void onBackwardActivated();
105	void forwardClicked();	101	void onForwardActivated();
106	void jump_forward();	102	void onJumpForwardActivated();
107	void jump_backward();	103	void onJumpBackwardActivated();
108	void onMuteChanged(bool);	104	void onMuteActivated(bool);
109		105	void onVolumeStepActivated(int val);
110	void volumeChangedByTick(int val);
111	void volumeHigher();	106	void onVolumeHigherActivated();
112	void volumeLower();	107	void onVolumeLowerActivated();
113		108
114	/* File */	109	/* File */
115		110
116	/* View */	111	/* View */
117	void showLibrary(bool, bool resize=true);	112	void showLibrary(bool, bool resize=true);
	...		...
154	GUI_Playlist* ui_playlist;	149	GUI_Playlist* ui_playlist;
155	GUI_Library_windowed* ui_library;	150	GUI_Library_windowed* ui_library;
156	GUI_LibraryPath* ui_libpath;	151	GUI_LibraryPath* ui_libpath;
157	GUI_InfoDialog* ui_info_dialog;	152	GUI_InfoDialog* ui_info_dialog;
158	GUI_Notifications* ui_notifications;	153	GUI_Notifications* ui_notifications;
159	GUI_Startup_Dialog* ui_startup_dialog;
160	CoverLookup* m_cov_lookup;
161	QNetworkAccessManager *m_netmanager;	154	QNetworkAccessManager *m_netmanager;
162	GUI_Alternate_Covers* m_alternate_covers;
163		155
164	QString m_class_name;	156	QString m_class_name;
165	QString m_renderer_friendly_name;	157	QString m_renderer_friendly_name;
166	quint32 m_completeLength_ms;
167	GUI_TrayIcon * m_trayIcon;	158	GUI_TrayIcon * m_trayIcon;
168		159
169	QString m_skinSuffix;	160	QString m_skinSuffix;
170		161
171	MetaData m_metadata;	162	MetaData m_metadata;
172	MetaData m_metadata_corrected;
173	bool m_metadata_available;	163	bool m_metadata_available;
174	bool m_overridemin2tray;	164	bool m_overridemin2tray;
175		165
176	int m_library_width;	166	int m_library_width;
177	int m_library_stretch_factor;	167	int m_library_stretch_factor;