From b17719f69ccbafd500e36396729c6f56f31d9d6f Mon Sep 17 00:00:00 2001
From: bnnm <bananaman255@gmail.com>
Date: Fri, 24 Aug 2018 19:37:02 +0200
Subject: [PATCH] Rename render_vgmstream_nolayout to _flat for
 clarity/consistency

But not layout_none to layout_flat, since it's used everywhere
---
 src/formats.c       | 2 +-
 src/layout/flat.c   | 2 +-
 src/layout/layout.h | 2 +-
 src/vgmstream.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/formats.c b/src/formats.c
index cb7de7e7..6fca461c 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -614,7 +614,7 @@ static const coding_info coding_info_list[] = {
 };
 
 static const layout_info layout_info_list[] = {
-        {layout_none,                   "flat (no layout)"},
+        {layout_none,                   "flat"},
         {layout_interleave,             "interleave"},
 
         {layout_segmented,              "segmented"},
diff --git a/src/layout/flat.c b/src/layout/flat.c
index f481a034..f38198aa 100644
--- a/src/layout/flat.c
+++ b/src/layout/flat.c
@@ -1,7 +1,7 @@
 #include "layout.h"
 #include "../vgmstream.h"
 
-void render_vgmstream_nolayout(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream) {
+void render_vgmstream_flat(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream) {
     int samples_written=0;
 
     const int samples_this_block = vgmstream->num_samples;
diff --git a/src/layout/layout.h b/src/layout/layout.h
index bd17b738..b3597320 100644
--- a/src/layout/layout.h
+++ b/src/layout/layout.h
@@ -49,7 +49,7 @@ void block_update_xa_aiff(off_t block_offset, VGMSTREAM * vgmstream);
 /* other layouts */
 void render_vgmstream_interleave(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream);
 
-void render_vgmstream_nolayout(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream);
+void render_vgmstream_flat(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream);
 
 void render_vgmstream_aix(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream);
 
diff --git a/src/vgmstream.c b/src/vgmstream.c
index 79ff9e9a..bf1488b2 100644
--- a/src/vgmstream.c
+++ b/src/vgmstream.c
@@ -940,7 +940,7 @@ void render_vgmstream(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstre
             render_vgmstream_interleave(buffer,sample_count,vgmstream);
             break;
         case layout_none:
-            render_vgmstream_nolayout(buffer,sample_count,vgmstream);
+            render_vgmstream_flat(buffer,sample_count,vgmstream);
             break;
         case layout_blocked_mxch:
         case layout_blocked_ast: