From 278df9b843617ae4d595c83e2bfbdd26a25dfa52 Mon Sep 17 00:00:00 2001
From: newfla <newfla@hotmail.it>
Date: Mon, 3 Mar 2025 16:53:36 +0100
Subject: [PATCH] Revert "fix: segment_callaback logic"

This reverts commit 684ec8e733ccad412b52759b7d902aaf096b2b7a.
---
 src/whisper_params.rs | 56 ++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/whisper_params.rs b/src/whisper_params.rs
index 1113791..1bb2808 100644
--- a/src/whisper_params.rs
+++ b/src/whisper_params.rs
@@ -419,20 +419,26 @@ impl<'a, 'b> FullParams<'a, 'b> {
         {
             unsafe {
                 let user_data = &mut *(user_data as *mut SegmentCallbackFn);
-                let text = whisper_rs_sys::whisper_full_get_segment_text_from_state(state, n_new);
-                let text = CStr::from_ptr(text);
+                let n_segments = whisper_rs_sys::whisper_full_n_segments_from_state(state);
+                let s0 = n_segments - n_new;
+                //let user_data = user_data as *mut Box<dyn FnMut(SegmentCallbackData)>;
 
-                let t0 = whisper_rs_sys::whisper_full_get_segment_t0_from_state(state, n_new);
-                let t1 = whisper_rs_sys::whisper_full_get_segment_t1_from_state(state, n_new);
+                for i in s0..n_segments {
+                    let text = whisper_rs_sys::whisper_full_get_segment_text_from_state(state, i);
+                    let text = CStr::from_ptr(text);
 
-                match text.to_str() {
-                    Ok(n) => user_data(SegmentCallbackData {
-                        segment: n_new + 1,
-                        start_timestamp: t0,
-                        end_timestamp: t1,
-                        text: n.to_string(),
-                    }),
-                    Err(_) => {}
+                    let t0 = whisper_rs_sys::whisper_full_get_segment_t0_from_state(state, i);
+                    let t1 = whisper_rs_sys::whisper_full_get_segment_t1_from_state(state, i);
+
+                    match text.to_str() {
+                        Ok(n) => user_data(SegmentCallbackData {
+                            segment: i,
+                            start_timestamp: t0,
+                            end_timestamp: t1,
+                            text: n.to_string(),
+                        }),
+                        Err(_) => {}
+                    }
                 }
             }
         }
@@ -482,17 +488,23 @@ impl<'a, 'b> FullParams<'a, 'b> {
         {
             unsafe {
                 let user_data = &mut *(user_data as *mut SegmentCallbackFn);
-                let text = whisper_rs_sys::whisper_full_get_segment_text_from_state(state, n_new);
-                let text = CStr::from_ptr(text);
+                let n_segments = whisper_rs_sys::whisper_full_n_segments_from_state(state);
+                let s0 = n_segments - n_new;
+                //let user_data = user_data as *mut Box<dyn FnMut(SegmentCallbackData)>;
 
-                let t0 = whisper_rs_sys::whisper_full_get_segment_t0_from_state(state, n_new);
-                let t1 = whisper_rs_sys::whisper_full_get_segment_t1_from_state(state, n_new);
-                user_data(SegmentCallbackData {
-                    segment: n_new,
-                    start_timestamp: t0,
-                    end_timestamp: t1,
-                    text: text.to_string_lossy().to_string(),
-                });
+                for i in s0..n_segments {
+                    let text = whisper_rs_sys::whisper_full_get_segment_text_from_state(state, i);
+                    let text = CStr::from_ptr(text);
+
+                    let t0 = whisper_rs_sys::whisper_full_get_segment_t0_from_state(state, i);
+                    let t1 = whisper_rs_sys::whisper_full_get_segment_t1_from_state(state, i);
+                    user_data(SegmentCallbackData {
+                        segment: i,
+                        start_timestamp: t0,
+                        end_timestamp: t1,
+                        text: text.to_string_lossy().to_string(),
+                    });
+                }
             }
         }