pcm: hw: do not reset tstamp_type in SND_PCM_APPEND mode (#2)

This is basically redo of all changed and add appropriate conditions
to disable only ioctl calls, but preserve tstamp_type assignments.

Fixes: 15f2b27 ("pcm: hw: fix default timestamp type for O_APPPEND")
Fixes: 7e01443 ("pcm: hw: do not reset tstamp_type in SND_PCM_APPEND mode")
Link: alsa-project#450
Suggested-by: Signed-off-by: Kevin Groeneveld <kgroeneveld@lenbrook.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

Author: perexg

src/pcm/pcm_hw.c

@@ -1665,36 +1665,30 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name, int fd,
 		}
 	}
 
-	if (!(mode & SND_PCM_APPEND)) {
 #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
-		if (SNDRV_PROTOCOL_VERSION(2, 0, 9) <= ver) {
-			struct timespec timespec;
-			if (clock_gettime(CLOCK_MONOTONIC, &timespec) == 0) {
+	if (SNDRV_PROTOCOL_VERSION(2, 0, 9) <= ver) {
+		struct timespec timespec;
+		if (clock_gettime(CLOCK_MONOTONIC, &timespec) == 0) {
+			if (!(mode & SND_PCM_APPEND)) {
 				int on = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC;
 				if (ioctl(fd, SNDRV_PCM_IOCTL_TTSTAMP, &on) < 0) {
 					ret = -errno;
 					SNDMSG("TTSTAMP failed");
 					return ret;
 				}
-				tstamp_type = SND_PCM_TSTAMP_TYPE_MONOTONIC;
 			}
-		} else
+			tstamp_type = SND_PCM_TSTAMP_TYPE_MONOTONIC;
+		}
+	} else
 #endif
-		if (SNDRV_PROTOCOL_VERSION(2, 0, 5) <= ver) {
-			int on = 1;
-			if (ioctl(fd, SNDRV_PCM_IOCTL_TSTAMP, &on) < 0) {
-				ret = -errno;
-				SNDMSG("TSTAMP failed");
-				return ret;
-			}
+	  if (SNDRV_PROTOCOL_VERSION(2, 0, 5) <= ver && !(mode & SND_PCM_APPEND)) {
+		int on = 1;
+		if (ioctl(fd, SNDRV_PCM_IOCTL_TSTAMP, &on) < 0) {
+			ret = -errno;
+			SNDMSG("TSTAMP failed");
+			return ret;
 		}
 	}
-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
-	else {
-		/* the first stream already sets this */
-		tstamp_type = SND_PCM_TSTAMP_TYPE_MONOTONIC;
-	}
-#endif
 
 	hw = calloc(1, sizeof(snd_pcm_hw_t));
 	if (!hw) {