Extend server resource loading, work on client

Also, cleanup in preparation for changing code style.

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/buffer/audio.c b/src/buffer/audio.c
index 0d78382..2cedcc8 100644
--- a/src/buffer/audio.c
+++ b/src/buffer/audio.c
@@ -11,7 +11,7 @@
 
 #define BUFFER_SIZE 9.0
 #define BUFFER_MARK_MIN 4.3 // Must be a most half of the buffer size.
-#define BUFFER_MARK_BUFFERED 4.0
+#define BUFFER_MARK_BUFFERED 2.5
 
 #ifdef CAMU_AUDIO_BUFFER_FADE
 #define FADE_STEP(fmt) (1.75f / (fmt)->sample_rate)
@@ -101,10 +101,10 @@ void camu_audio_buffer_set_latency(struct camu_audio_buffer *buf, f64 latency)
 }
 
 #ifdef _DEBUG_
-#define OCCUPIED_SECONDS_DEBUG(buf) \
+#define BUFFERED_SECONDS_DEBUG(buf) \
     camu_audio_format_bytes_to_sec(&buf->fmt.req, al_ring_buffer_occupied(&buf->rb))
 #else
-#define OCCUPIED_SECONDS_DEBUG(buf) 0
+#define BUFFERED_SECONDS_DEBUG(buf) 0
 #endif
 
 static inline bool frame_is_late(struct camu_clock *clock, f64 base, f64 pts, f64 duration)
@@ -137,7 +137,7 @@ static bool push_internal(struct camu_audio_buffer *buf, f64 pts, u8 **data, s32
 
     size_t space = al_ring_buffer_space(&buf->rb);
     if (!buf->buffered && buf->size - space > buf->mark.buffered) {
-        al_log_debug("audio_buffer", "Buffered (mark: %.2fs).", OCCUPIED_SECONDS_DEBUG(buf));
+        al_log_debug("audio_buffer", "Buffered (mark: %.2fs).", BUFFERED_SECONDS_DEBUG(buf));
         buf->callback(buf->userdata, CAMU_BUFFER_BUFFERED);
         buf->buffered = true;
     }
@@ -213,7 +213,7 @@ void camu_audio_buffer_flush(struct camu_audio_buffer *buf)
         al_log_debug("audio_buffer", "Buffer filled by flush.");
     }
     if (!buf->buffered) {
-        al_log_debug("audio_buffer", "Buffered (mark: %.2fs).", OCCUPIED_SECONDS_DEBUG(buf));
+        al_log_debug("audio_buffer", "Buffered (mark: %.2fs).", BUFFERED_SECONDS_DEBUG(buf));
         buf->callback(buf->userdata, CAMU_BUFFER_BUFFERED);
         buf->buffered = true;
     }