Compare commits

..

No commits in common. "0.5" and "0.4" have entirely different histories.
0.5 ... 0.4

View file

@ -85,45 +85,40 @@ bool MainWindow::sende_befehl(){
} }
void MainWindow::on_pushButton_pause_clicked(){ void MainWindow::on_pushButton_pause_clicked(){
if(status_auto=="an"){ while(status_loop=="ja")
while(status_loop=="ja") ui->statusbar->showMessage("~");
ui->statusbar->showMessage("~"); if(status_player1=="play"){
if(status_player1=="play"){ befehl=befehl_pause1;
befehl=befehl_pause1; sende_befehl();
sende_befehl();
}else if(status_player2=="play"){ }else if(status_player2=="play"){
befehl=befehl_pause2; befehl=befehl_pause2;
sende_befehl(); sende_befehl();
}
} }
} }
void MainWindow::on_pushButton_play_clicked(){ void MainWindow::on_pushButton_play_clicked(){
if(status_auto=="an"){ while(status_loop=="ja")
while(status_loop=="ja") ui->statusbar->showMessage("~");
ui->statusbar->showMessage("~"); if(!(status_player1=="play") || !(status_player2=="play")){
if(!(status_player1=="play") || !(status_player2=="play")){ if(status_player1=="pause"){
if(status_player1=="pause"){ befehl=befehl_play1;
befehl=befehl_play1; sende_befehl();
sende_befehl(); }else if(status_player2=="pause"){
}else if(status_player2=="pause"){ befehl=befehl_play2;
befehl=befehl_play2; sende_befehl();
sende_befehl(); }else{
}else{ befehl=befehl_play1;
befehl=befehl_play1; sende_befehl();
sende_befehl();
}
} }
} }
} }
void MainWindow::on_pushButton_fade_clicked(){ void MainWindow::on_pushButton_fade_clicked(){
if(status_auto=="an"){ while(status_loop=="ja")
while(status_loop=="ja") ui->statusbar->showMessage("~");
ui->statusbar->showMessage("~"); if(status_player1=="play" || status_player2=="play"){
if(status_player1=="play" || status_player2=="play"){ befehl=befehl_fade;
befehl=befehl_fade; sende_befehl();
sende_befehl();
}
} }
} }