Ticket #2557: mythmusic_reuseaudio.diff
File mythmusic_reuseaudio.diff, 1.2 KB (added by , 17 years ago) |
---|
-
mythmusic/mythmusic/playbackbox.cpp
217 217 { 218 218 stopAll(); 219 219 220 if (output) 221 { 222 delete output; 223 output = NULL; 224 } 225 220 226 if (progress) 221 227 { 222 228 progress->Close(); … … 1055 1061 1056 1062 void PlaybackBoxMusic::play() 1057 1063 { 1064 1058 1065 if (isplaying) 1059 1066 stop(); 1060 1067 … … 1072 1079 1073 1080 if (!output) 1074 1081 openOutputDevice(); 1075 1082 1076 1083 if (output->GetPause()) 1077 1084 { 1078 1085 pause(); … … 1255 1262 if (output) 1256 1263 { 1257 1264 isplaying = !isplaying; 1258 output->Pause(!isplaying); //Note pause doesn't take effe t instantly1265 output->Pause(!isplaying); //Note pause doesn't take effect instantly 1259 1266 } 1260 1267 // wake up threads 1261 1268 if (decoder) … … 1289 1296 1290 1297 void PlaybackBoxMusic::stop(void) 1291 1298 { 1292 stopDecoder();1293 1294 1299 if (output) 1295 1300 { 1296 delete output; 1297 output = 0; 1301 output->Reset(); 1302 1303 if (output->GetPause()) 1304 { 1305 pause(); 1306 } 1298 1307 } 1299 1308 1309 stopDecoder(); 1310 1300 1311 mainvisual->setDecoder(0); 1301 1312 mainvisual->setOutput(0); 1302 1313