From 30eef7ed43edbeb5dc94b53ae5992b72bdb85189 Mon Sep 17 00:00:00 2001
From: bnnm <bananaman255@gmail.com>
Date: Thu, 30 Jul 2020 23:50:56 +0200
Subject: [PATCH] Minor renames

---
 fb2k/foo_vgmstream.cpp | 4 ++--
 src/plugins.c          | 4 ++--
 src/plugins.h          | 4 ++--
 winamp/in_vgmstream.c  | 4 ++--
 xmplay/xmp_vgmstream.c | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fb2k/foo_vgmstream.cpp b/fb2k/foo_vgmstream.cpp
index b74c1625..ba2bccc8 100644
--- a/fb2k/foo_vgmstream.cpp
+++ b/fb2k/foo_vgmstream.cpp
@@ -486,8 +486,8 @@ void input_vgmstream::apply_config(VGMSTREAM* vgmstream) {
 
     vcfg.allow_play_forever = 1;
     vcfg.play_forever = loop_forever;
-    vcfg.loop_times = loop_count;
-    vcfg.fade_period = fade_seconds;
+    vcfg.loop_count = loop_count;
+    vcfg.fade_time = fade_seconds;
     vcfg.fade_delay = fade_delay_seconds;
     vcfg.ignore_loop = ignore_loop;
 
diff --git a/src/plugins.c b/src/plugins.c
index a1b55c80..7bec001f 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -129,11 +129,11 @@ static void load_player_config(play_config_t* def, vgmstream_cfg_t* vcfg) {
     def->really_force_loop = vcfg->really_force_loop;
     def->ignore_fade = vcfg->ignore_fade;
 
-    def->loop_count = vcfg->loop_times;  //todo loop times
+    def->loop_count = vcfg->loop_count;
     def->loop_count_set = 1;
     def->fade_delay = vcfg->fade_delay;
     def->fade_delay_set = 1;
-    def->fade_time = vcfg->fade_period; //todo loop period
+    def->fade_time = vcfg->fade_time;
     def->fade_time_set = 1;
 }
 
diff --git a/src/plugins.h b/src/plugins.h
index db1ab55c..8b26cdf3 100644
--- a/src/plugins.h
+++ b/src/plugins.h
@@ -53,9 +53,9 @@ typedef struct {
     int ignore_fade;            /*  don't fade after N loops */
 
     /* song processing */
-    double loop_times;          /* target loops */
+    double loop_count;          /* target loops */
     double fade_delay;          /* fade delay after target loops */
-    double fade_period;         /* fade time after target loops */
+    double fade_time;           /* fade period after target loops */
 
   //int downmix;                /* max number of channels allowed (0=disable downmix) */
 
diff --git a/winamp/in_vgmstream.c b/winamp/in_vgmstream.c
index 323e83f9..a20bf5ba 100644
--- a/winamp/in_vgmstream.c
+++ b/winamp/in_vgmstream.c
@@ -936,8 +936,8 @@ static void apply_config(VGMSTREAM* vgmstream, winamp_settings_t* settings) {
 
     vcfg.allow_play_forever = 1;
     vcfg.play_forever = settings->loop_forever;
-    vcfg.loop_times = settings->loop_count;
-    vcfg.fade_period = settings->fade_time;
+    vcfg.loop_count = settings->loop_count;
+    vcfg.fade_time = settings->fade_time;
     vcfg.fade_delay = settings->fade_delay;
     vcfg.ignore_loop = settings->ignore_loop;
 
diff --git a/xmplay/xmp_vgmstream.c b/xmplay/xmp_vgmstream.c
index 22ca6393..15cc95d5 100644
--- a/xmplay/xmp_vgmstream.c
+++ b/xmplay/xmp_vgmstream.c
@@ -173,8 +173,8 @@ static void apply_config(VGMSTREAM* vgmstream) {
 
     vcfg.allow_play_forever = 0;
   //vcfg.play_forever = loop_forever;
-    vcfg.loop_times = loop_count;
-    vcfg.fade_period = fade_seconds;
+    vcfg.loop_count = loop_count;
+    vcfg.fade_time = fade_seconds;
     vcfg.fade_delay = fade_delay;
     vcfg.ignore_loop = ignore_loop;