upplay / Code / Diff of /GUI/mainw/mw

Diff of /GUI/mainw/mw_controls.cpp [ea731d] .. [8c7b8c]

Switch to unified view


...

#include "mainw.h"
#include "trayicon.h"

/** Slots connected to player or trayicon signals **/
void GUI_Player::onPlayActivated()
{
    // We don't know which control caused this, so make sure all ui are setup
    m_trayIcon->setPlaying(true);
    ui->player_w->playctl()->onPlaying();

    emit play();
}

void GUI_Player::onPauseActivated()
{
    // We don't know which control caused this, so make sure all ui are setup
    m_trayIcon->setPlaying(false);
    ui->player_w->playctl()->onPaused();

    emit pause();
}

void GUI_Player::onStopActivated()
{
    m_trayIcon->setPlaying(false);
    m_trayIcon->stop();

    ui->player_w->playctl()->onStopped();

    idleDisplay();
    emit stop();
}

void GUI_Player::onMuteActivated(bool mute)
{
    m_trayIcon->setMute(mute);
    ui->player_w->volume()->setMuteUi(mute);

    emit sig_mute(mute);
...

    ui->player_w->albumCover->setIcon(QIcon(Helper::getIconPath() +
                                            "logo.png"));
}

void GUI_Player::onBackwardActivated()
{
    // ui->albumCover->setFocus();
    int cur_pos_sec =
        (m_metadata.length_ms * ui->player_w->progress()->currentValuePc())
        / 100000;
    if (cur_pos_sec > 3) {
        emit sig_seek(0);
    } else {
        emit backward();
    }
}

void GUI_Player::onForwardActivated()
{
    //ui->albumCover->setFocus();
    emit forward();
}


/** PROGRESS BAR **/

void GUI_Player::total_time_changed(qint64 total_time)
{

    ui->player_w->progress()->setTotalTime(total_time/1000);
}

void GUI_Player::onJumpForwardActivated()
{
    ui->player_w->progress()->step(1);
}

void GUI_Player::onJumpBackwardActivated()
{
    ui->player_w->progress()->step(-1);
}

// This is called from the external world to update the position
...
void GUI_Player::setMuteUi(bool ismute)
{
    ui->player_w->volume()->setMuteUi(ismute);
}

void GUI_Player::onVolumeStepActivated(int val)
{
    int vol_step = m_trayIcon->get_vol_step();
    ui->player_w->volume()->step(vol_step * val);
}

void GUI_Player::onVolumeHigherActivated()
{
    //qDebug() << "GUI_PLayer::volumeHigher";
    ui->player_w->volume()->volumeHigher();
}

void GUI_Player::onVolumeLowerActivated()
{
    //qDebug() << "GUI_PLayer::volumeLower";
    ui->player_w->volume()->volumeLower();
}


	a/GUI/mainw/mw_controls.cpp		b/GUI/mainw/mw_controls.cpp
	...		...
22		22
23	#include "mainw.h"	23	#include "mainw.h"
24	#include "trayicon.h"	24	#include "trayicon.h"
25		25
26	/ Slots connected to player or trayicon signals /	26	/ Slots connected to player or trayicon signals /
27	void GUI_Player::playClicked()	27	void GUI_Player::onPlayActivated()
28	{	28	{
29	// We don't know which control caused this, so make sure all ui are setup	29	// We don't know which control caused this, so make sure all ui are setup
30	m_trayIcon->setPlaying(true);	30	m_trayIcon->setPlaying(true);
31	ui->player_w->playctl()->onPlaying();	31	ui->player_w->playctl()->onPlaying();
32		32
33	emit play();	33	emit play();
34	}	34	}
35		35
36	void GUI_Player::pauseClicked()	36	void GUI_Player::onPauseActivated()
37	{	37	{
38	// We don't know which control caused this, so make sure all ui are setup	38	// We don't know which control caused this, so make sure all ui are setup
39	m_trayIcon->setPlaying(false);	39	m_trayIcon->setPlaying(false);
40	ui->player_w->playctl()->onPaused();	40	ui->player_w->playctl()->onPaused();
41		41
42	emit pause();	42	emit pause();
43	}	43	}
44		44
45	void GUI_Player::stopClicked()	45	void GUI_Player::onStopActivated()
46	{	46	{
47	m_trayIcon->setPlaying(false);	47	m_trayIcon->setPlaying(false);
48	m_trayIcon->stop();	48	m_trayIcon->stop();
49		49
50	ui->player_w->playctl()->onStopped();	50	ui->player_w->playctl()->onStopped();
51		51
52	idleDisplay();	52	idleDisplay();
53	emit stop();	53	emit stop();
54	}	54	}
55		55
56	void GUI_Player::onMuteChanged(bool mute)	56	void GUI_Player::onMuteActivated(bool mute)
57	{	57	{
58	m_trayIcon->setMute(mute);	58	m_trayIcon->setMute(mute);
59	ui->player_w->volume()->setMuteUi(mute);	59	ui->player_w->volume()->setMuteUi(mute);
60		60
61	emit sig_mute(mute);	61	emit sig_mute(mute);
	...		...
75		75
76	ui->player_w->albumCover->setIcon(QIcon(Helper::getIconPath() +	76	ui->player_w->albumCover->setIcon(QIcon(Helper::getIconPath() +
77	"logo.png"));	77	"logo.png"));
78	}	78	}
79		79
80	void GUI_Player::backwardClicked()	80	void GUI_Player::onBackwardActivated()
81	{	81	{
82	// ui->albumCover->setFocus();	82	// ui->albumCover->setFocus();
83	int cur_pos_sec =	83	int cur_pos_sec =
84	(m_completeLength_ms * ui->player_w->progress()->currentValuePc())	84	(m_metadata.length_ms * ui->player_w->progress()->currentValuePc())
85	/ 100000;	85	/ 100000;
86	if (cur_pos_sec > 3) {	86	if (cur_pos_sec > 3) {
87	emit sig_seek(0);	87	emit sig_seek(0);
88	} else {	88	} else {
89	emit backward();	89	emit backward();
90	}	90	}
91	}	91	}
92		92
93	void GUI_Player::forwardClicked()	93	void GUI_Player::onForwardActivated()
94	{	94	{
95	//ui->albumCover->setFocus();	95	//ui->albumCover->setFocus();
96	emit forward();	96	emit forward();
97	}	97	}
98		98
99		99
100	/ PROGRESS BAR /	100	/ PROGRESS BAR /
101		101
102	void GUI_Player::total_time_changed(qint64 total_time)	102	void GUI_Player::total_time_changed(qint64 total_time)
103	{	103	{
104	m_completeLength_ms = total_time;
105	ui->player_w->progress()->setTotalTime(total_time/1000);	104	ui->player_w->progress()->setTotalTime(total_time/1000);
106	}	105	}
107		106
108	void GUI_Player::jump_forward()	107	void GUI_Player::onJumpForwardActivated()
109	{	108	{
110	ui->player_w->progress()->step(1);	109	ui->player_w->progress()->step(1);
111	}	110	}
112		111
113	void GUI_Player::jump_backward()	112	void GUI_Player::onJumpBackwardActivated()
114	{	113	{
115	ui->player_w->progress()->step(-1);	114	ui->player_w->progress()->step(-1);
116	}	115	}
117		116
118	// This is called from the external world to update the position	117	// This is called from the external world to update the position
	...		...
144	void GUI_Player::setMuteUi(bool ismute)	143	void GUI_Player::setMuteUi(bool ismute)
145	{	144	{
146	ui->player_w->volume()->setMuteUi(ismute);	145	ui->player_w->volume()->setMuteUi(ismute);
147	}	146	}
148		147
149	void GUI_Player::volumeChangedByTick(int val)	148	void GUI_Player::onVolumeStepActivated(int val)
150	{	149	{
151	int vol_step = m_trayIcon->get_vol_step();	150	int vol_step = m_trayIcon->get_vol_step();
152	ui->player_w->volume()->step(vol_step * val);	151	ui->player_w->volume()->step(vol_step * val);
153	}	152	}
154		153
155	void GUI_Player::volumeHigher()	154	void GUI_Player::onVolumeHigherActivated()
156	{	155	{
157	//qDebug() << "GUI_PLayer::volumeHigher";	156	//qDebug() << "GUI_PLayer::volumeHigher";
158	ui->player_w->volume()->volumeHigher();	157	ui->player_w->volume()->volumeHigher();
159	}	158	}
160		159
161	void GUI_Player::volumeLower()	160	void GUI_Player::onVolumeLowerActivated()
162	{	161	{
163	//qDebug() << "GUI_PLayer::volumeLower";	162	//qDebug() << "GUI_PLayer::volumeLower";
164	ui->player_w->volume()->volumeLower();	163	ui->player_w->volume()->volumeLower();
165	}	164	}
166		165