diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c
index d818b1a86f1..a02deadef89 100644
--- a/src/mame/audio/flower.c
+++ b/src/mame/audio/flower.c
@@ -123,7 +123,7 @@ static STREAM_UPDATE( flower_update_mono )
 							voice->oneshotplaying = 0;
 						}
 
-						if (voice->oneshotplaying)
+						else
 						{
 //                          *mix++ += ((w[offs] - 0x80) * v) / 16;
 							*mix++ += sound_rom2[v*256 + w[offs]] - 0x80;
@@ -211,7 +211,7 @@ DEVICE_GET_INFO( flower_sound )
 
 		/* --- the following bits of info are returned as NULL-terminated strings --- */
 		case DEVINFO_STR_NAME:							strcpy(info->s, "Flower Custom");				break;
-		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_SOURCE_FILE:					strcpy(info->s, __FILE__);						break;
 	}
 }
 
diff --git a/src/mame/audio/wiping.c b/src/mame/audio/wiping.c
index 8b6b854b9c3..bd49e0fa940 100644
--- a/src/mame/audio/wiping.c
+++ b/src/mame/audio/wiping.c
@@ -124,7 +124,7 @@ static STREAM_UPDATE( wiping_update_mono )
 							voice->oneshotplaying = 0;
 						}
 
-						if (voice->oneshotplaying)
+						else
 						{
 							/* use full byte, first the high 4 bits, then the low 4 bits */
 							if (offs & 1)
@@ -204,7 +204,7 @@ DEVICE_GET_INFO( wiping_sound )
 
 		/* --- the following bits of info are returned as NULL-terminated strings --- */
 		case DEVINFO_STR_NAME:							strcpy(info->s, "Wiping Custom");				break;
-		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_SOURCE_FILE:					strcpy(info->s, __FILE__);						break;
 	}
 }