Merge commit 'meins/master'

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index a8fe08105912af0ee5235a255f13f400b1f1bf2f..922f04229c47ea3545f401bf3c6429ef86695e1d 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -1925,7 +1925,7 @@ struct com_touch_options {
        /** New image id. */
        int32_t image_id;
        /** New amplification value. */
-       uint8_t amp;
+       int32_t amp;
        /** Command line flags (see \ref touch_flags). */
        unsigned flags;
 };
@@ -1947,7 +1947,7 @@ static int touch_audio_file(__a_unused struct osl_table *table,
        struct osl_object obj;
        struct afs_info old_afsi, new_afsi;
        int ret, no_options = tad->cto->num_played < 0 && tad->cto->last_played < 0 &&
-               tad->cto->lyrics_id < 0 && tad->cto->image_id < 0;
+               tad->cto->lyrics_id < 0 && tad->cto->image_id < 0 && tad->cto->amp < 0;
        struct afsi_change_event_data aced;
 
        ret = get_afsi_object_of_row(row, &obj);
@@ -1981,7 +1981,8 @@ static int touch_audio_file(__a_unused struct osl_table *table,
                        new_afsi.num_played = tad->cto->num_played;
                if (tad->cto->last_played >= 0)
                        new_afsi.last_played = tad->cto->last_played;
-               new_afsi.amp = tad->cto->amp;
+               if (tad->cto->amp >= 0)
+                       new_afsi.amp = tad->cto->amp;
        }
        tad->num_matches++;
        save_afsi(&new_afsi, &obj); /* in-place update */
@@ -2030,7 +2031,7 @@ int com_touch(int fd, int argc, char * const * const argv)
                .last_played = -1,
                .lyrics_id = -1,
                .image_id = -1,
-               .amp = 0,
+               .amp = -1,
        };
        struct osl_object query = {.data = &cto, .size = sizeof(cto)};
        int i, ret;