mirror/CasterSoundboard
3
0
Fork 0
mirror of https://github.com/JupiterBroadcasting/CasterSoundboard.git synced 2025-10-29 11:36:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63 from TheRedPepper/MediaPlayerFix

Browse Source 
Fixed issue with tab deletion and Issue #58.
This commit is contained in:
Oscar Cerna-Mandujano 2017-06-10 02:50:16 -07:00 committed by GitHub
commit c41a4f2ec4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CasterSoundboard/CasterPlayer.cpp
View File

@ -59,7 +59,7 @@ CasterPlayerWidget::CasterPlayerWidget(QWidget* parent) : QWidget(parent)
this->setAcceptDrops(true);
//Init Player
player = new QMediaPlayer();
player = new QMediaPlayer(this);
playStateImage = new QImage;
playStateImage->load(":/res/img/playState_playing.png");
//Init Properties

8
CasterSoundboard/MainWindow.cpp
View File

@ -187,10 +187,14 @@ void MainWindow::mainTabContainerTabClosedRequested(int tabIndex)
msgBox.setModal(true);
if(msgBox.exec() == QMessageBox::Yes)
{
CasterBoard *toBeDeleted = dynamic_cast<CasterBoard*>(mainTabContainer->widget(tabIndex));
//CLOSE REQUESTED TAB
disconnect(dynamic_cast<CasterBoard*>(mainTabContainer->widget(tabIndex)), SIGNAL(globalHotKeyReleasedEvent(QKeyEvent*)),this,SLOT(handleGlobalHotKeyEventFromCurrentWidget(QKeyEvent*)));
disconnect(dynamic_cast<CasterBoard*>(mainTabContainer->widget(tabIndex)), SIGNAL(_updateOSCClient(OscMessageComposer)),this,SLOT(sendOSCMessageToClient(OscMessageComposer)));
disconnect(toBeDeleted, SIGNAL(globalHotKeyReleasedEvent(QKeyEvent*)),this,SLOT(handleGlobalHotKeyEventFromCurrentWidget(QKeyEvent*)));
disconnect(toBeDeleted, SIGNAL(_updateOSCClient(OscMessageComposer)),this,SLOT(sendOSCMessageToClient(OscMessageComposer)));
mainTabContainer->removeTab(tabIndex);
if(toBeDeleted) {
delete toBeDeleted;
}
}
}