vice-emu-commit Mailing List for VICE

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 45799
          http://sourceforge.net/p/vice-emu/code/45799
Author:   pottendo
Date:     2025-10-23 19:50:31 +0000 (Thu, 23 Oct 2025)
Log Message:
-----------
added FunMP3 dir select GTK3 widget, fixed crashes

Modified Paths:
--------------
    trunk/vice/src/arch/gtk3/widgets/settings_userport.c
    trunk/vice/src/arch/shared/archdep_glob.c
    trunk/vice/src/arch/shared/archdep_glob.h
    trunk/vice/src/userport/userport_funmp3.c

Modified: trunk/vice/src/arch/gtk3/widgets/settings_userport.c
===================================================================

--- trunk/vice/src/arch/gtk3/widgets/settings_userport.c	2025-10-21 21:02:10 UTC (rev 45798)
+++ trunk/vice/src/arch/gtk3/widgets/settings_userport.c	2025-10-23 19:50:31 UTC (rev 45799)
@@ -15,6 +15,7 @@
  * $VICERES WIC64Resetuser          x64 x64sc xscpu64 x128 xvic
  * $VICERES WIC64Timezone           x64 x64sc xscpu64 x128 xvic
  * $VICERES WIC64RemoteTimeout      x64 x64sc xscpu64 x128 xvic
+ * $VICERES FunMP3Dir               x64 x64sc xscpu64 x128 xvic xpet
  *
  * The following resources are not user-configurable, but set indirectly via
  * the WiC64 code, so we list them here for `gtk3-resources.py` to find:
@@ -97,6 +98,10 @@
 
 #endif
 
+#if defined(USE_MPG123) && defined(HAVE_GLOB_H)
+static GtkWidget *funmp3_save = NULL;
+#endif
+
 /** \brief  Create left-aligned label with Pango markup
  *
  * \param[in]   markup  text using Pango markup
@@ -164,6 +169,11 @@
         gtk_widget_set_sensitive(wic64_save, id == USERPORT_DEVICE_WIC64);
     }
 #endif
+#if defined(USE_MPG123) && defined(HAVE_GLOB_H)
+    if (funmp3_save != NULL) {
+        gtk_widget_set_sensitive(funmp3_save, id == USERPORT_DEVICE_FUNMP3);
+    }
+#endif
 }
 
 /** \brief  Handler for the 'changed' event of the device combobox
@@ -345,7 +355,6 @@
     return combo;
 }
 
-
 #ifdef HAVE_LIBCURL
 
 /** \brief  Create widget for the "WIC64Logenabled" resource
@@ -430,6 +439,88 @@
 }
 #endif
 
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+/* FunMP3 path selection widget */
+#include "mainlock.h"
+
+/** \brief  Callback for the directory-select dialog
+ *
+ * \param[in]   dialog      directory-select dialog
+ * \param[in]   filename    filename (NULL if canceled)
+ * \param[in]   entry       entry box for the filename
+ */
+static void funmp3dir_browse_callback(GtkDialog *dialog, gchar *filename, gpointer entry)
+{
+    if (filename != NULL) {
+        vice_gtk3_resource_entry_set(GTK_WIDGET(entry), filename);
+        g_free(filename);
+    }
+    gtk_widget_destroy(GTK_WIDGET(dialog));
+}
+
+/** \brief  Handler for the 'clicked' event of the FunMP3 directory browse button
+ *
+ * \param[in]   button  FunMP3 directory browse button (unused)
+ * \param[in]   entry   FunMP3 directory text entry
+ */
+static void on_funmp3dir_browse_clicked(GtkWidget *button, gpointer entry)
+{
+    GtkWidget *dialog;
+
+    mainlock_assert_is_not_vice_thread();
+
+    dialog = vice_gtk3_select_directory_dialog("Select FunMP3 directory",
+                                               NULL,
+                                               TRUE,
+                                               NULL,
+                                               funmp3dir_browse_callback,
+                                               entry);
+    gtk_widget_show_all(dialog);
+}
+
+/** \brief  Create FunMP3 path selection entry widget
+ *
+ */
+static GtkWidget *create_funmp3dir_entry_widget(void)
+{
+    GtkWidget *entry;
+    entry = vice_gtk3_resource_entry_new("FunMP3Dir");
+    gtk_widget_set_tooltip_text(entry,
+                                "Select the host directory for MP3 files");
+    gtk_widget_set_hexpand(entry, TRUE);
+    return entry;
+}
+
+/** \brief  Create FunMP3 path selection widget
+ *
+ */
+static GtkWidget *create_funmp3dir_widget(void)
+{
+    GtkWidget *grid;
+    GtkWidget *entry;
+    GtkWidget *label;
+    GtkWidget *browse;
+
+    grid = vice_gtk3_grid_new_spaced(8, 0);
+
+    label  = gtk_label_new("FunMP3 directory");
+    gtk_widget_set_halign(label, GTK_ALIGN_START);
+    entry  = create_funmp3dir_entry_widget();
+    browse = gtk_button_new_with_label("Browse ...");
+    g_signal_connect_unlocked(browse,
+                              "clicked",
+                              G_CALLBACK(on_funmp3dir_browse_clicked),
+                              (gpointer)entry);
+    gtk_grid_attach(GTK_GRID(grid), label,  0, 1, 1, 1);
+    gtk_grid_attach(GTK_GRID(grid), entry,  1, 1, 1, 1);
+    gtk_grid_attach(GTK_GRID(grid), browse, 2, 1, 1, 1);
+
+    gtk_widget_show_all(grid);
+    return grid;
+}
+
+#endif  /* MPG123 && HAVE_GLOB_H */
+
 /** \brief   Handler for the 'clicked' event of the 'reset' buttons
  *
  * \param[in]   widget      button triggering the event
@@ -643,6 +734,24 @@
             break;
     }
 
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+    /* FunMP3 widget for userport featured machine, except cbm */
+    switch (machine_class) {
+        case VICE_MACHINE_C64:      /* fall through */
+        case VICE_MACHINE_C64SC:    /* fall through */
+        case VICE_MACHINE_SCPU64:   /* fall through */
+        case VICE_MACHINE_C128:     /* fall through */
+        case VICE_MACHINE_VIC20:    /* fall through */
+        case VICE_MACHINE_PET:      /* fall through */
+            funmp3_save = create_funmp3dir_widget();
+            gtk_grid_attach(GTK_GRID(grid), funmp3_save, 0, row, 2, 1);
+            row++;
+            break;
+        default:
+            break;
+    }
+#endif
+
     /* PET userport diagnostic pin */
     if (machine_class == VICE_MACHINE_PET) {
         diag_pin_active = create_diag_pin_active_widget();

Modified: trunk/vice/src/arch/shared/archdep_glob.c
===================================================================
--- trunk/vice/src/arch/shared/archdep_glob.c	2025-10-21 21:02:10 UTC (rev 45798)
+++ trunk/vice/src/arch/shared/archdep_glob.c	2025-10-23 19:50:31 UTC (rev 45799)
@@ -52,7 +52,7 @@
 static char *fh[1];
 
 /* expects an absolute path for pattern and many glob() functions are NOT implemented */
-int glob(const char *pattern, int flags, void *errfunc, glob_t *pglob)
+int archdep_glob(const char *pattern, int flags, void *errfunc, glob_t *pglob)
 {
    WIN32_FIND_DATA FindFileData;
    HANDLE hFind;
@@ -81,7 +81,7 @@
    return 0;
 }
 
-void globfree(glob_t *pglob)
+void archdep_globfree(glob_t *pglob)
 {
     lib_free(pglob->gl_pathv[0]);
 }

Modified: trunk/vice/src/arch/shared/archdep_glob.h
===================================================================
--- trunk/vice/src/arch/shared/archdep_glob.h	2025-10-21 21:02:10 UTC (rev 45798)
+++ trunk/vice/src/arch/shared/archdep_glob.h	2025-10-23 19:50:31 UTC (rev 45799)
@@ -37,6 +37,8 @@
 #if defined(UNIX_COMPILE)
 #if defined (HAVE_GLOB_H)
 #include <glob.h>
+#define archdep_glob glob
+#define archdep_globfree globfree
 #endif
 #endif
 
@@ -50,8 +52,8 @@
 } glob_t;
 
 /* expects an absolute path for pattern and many glob() functions are NOT implemented */
-int glob(const char *pattern, int flags, void *errfunc, glob_t *pglob);
-void globfree(glob_t *pglob);
+int archdep_glob(const char *pattern, int flags, void *errfunc, glob_t *pglob);
+void archdep_globfree(glob_t *pglob);
 
 #endif
 

Modified: trunk/vice/src/userport/userport_funmp3.c
===================================================================
--- trunk/vice/src/userport/userport_funmp3.c	2025-10-21 21:02:10 UTC (rev 45798)
+++ trunk/vice/src/userport/userport_funmp3.c	2025-10-23 19:50:31 UTC (rev 45799)
@@ -170,7 +170,7 @@
 
 static int funmp3_sound_machine_calculate_samples(sound_t **psid, int16_t *pbuf, int nr, int soc, int scc, CLOCK *delta_t)
 {
-    int i, j, rem;
+    size_t i, j, rem;
     int16_t sample;
     int res = 0;
     if (!mp3_playing) {
@@ -182,8 +182,9 @@
            put remaining samples to the front and decode new chunk */
         if (rem > 0) {
             /* copy unconsumed samples to the front */
-            for (i = act_pos, j = 0; i < size; i++, j++)
+            for (i = act_pos, j = 0; i < size; i++, j++) {
                 buf[j] = buf[i];
+            }
         }
         act_pos = 0;
         ret = mpg123_read(mh, (unsigned char *)bufr + (rem * sizeof(int16_t)),
@@ -211,7 +212,7 @@
         res = nr;
     } else {
         log_error(lh, "mpg123_read() error: %d", ret);
-        exit(1);
+        res = 0;
     }
     if (ret == MPG123_DONE) {
         funmp3_stop();
@@ -255,13 +256,13 @@
         snprintf(fn, ARCHDEP_PATH_MAX, "%05d*", val);
     }
     archdep_expand_path(&fn_abs, fn);
-    if ((glob(fn_abs, 0, NULL, &results) != 0) ||
+    if ((archdep_glob(fn_abs, 0, NULL, &results) != 0) ||
         (results.gl_pathc < 1)) {
         log_message(lh, "can't open '%s'", fn_abs);
         return;
     }
     mp3_name = lib_strdup(results.gl_pathv[0]);
-    globfree(&results);
+    archdep_globfree(&results);
     log_message(lh, "request to play '%s'", mp3_name);
 
     mpg123_close(mh);
@@ -303,7 +304,7 @@
     if (mh) {
         mpg123_close(mh);
     }
-    mp3_playing = 0;
+    mp3_playing = act_pos = size = 0;
     set_userport_flag(0);
 }
 
@@ -364,6 +365,7 @@
         mp3_last = 0;
         return;
     }
+    funmp3_stop();
     mp3_last = val;             /* the default is to repeat */
     funmp3_start(255 - val);    /* that's how it is defined */
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2008	Jan	Feb	Mar	Apr (38)	May (60)	Jun (122)	Jul (148)	Aug (178)	Sep (151)	Oct (131)	Nov (208)	Dec (129)
2009	Jan (193)	Feb (209)	Mar (221)	Apr (243)	May (165)	Jun (168)	Jul (198)	Aug (161)	Sep (103)	Oct (98)	Nov (168)	Dec (99)
2010	Jan (263)	Feb (156)	Mar (57)	Apr (93)	May (85)	Jun (124)	Jul (57)	Aug (58)	Sep (113)	Oct (148)	Nov (114)	Dec (193)
2011	Jan (200)	Feb (207)	Mar (91)	Apr (91)	May (142)	Jun (104)	Jul (115)	Aug (137)	Sep (266)	Oct (91)	Nov (85)	Dec (186)
2012	Jan (98)	Feb (146)	Mar (160)	Apr (99)	May (59)	Jun (257)	Jul (84)	Aug (103)	Sep (169)	Oct (206)	Nov (90)	Dec (296)
2013	Jan (294)	Feb (130)	Mar (36)	Apr (14)	May (51)	Jun (74)	Jul (180)	Aug (85)	Sep (26)	Oct (45)	Nov (29)	Dec (21)
2014	Jan (56)	Feb (40)	Mar (57)	Apr (30)	May (31)	Jun (11)	Jul (107)	Aug (135)	Sep (142)	Oct (195)	Nov (139)	Dec (133)
2015	Jan (293)	Feb (161)	Mar (146)	Apr (85)	May (139)	Jun (51)	Jul (21)	Aug (24)	Sep (29)	Oct (136)	Nov (212)	Dec (118)
2016	Jan (119)	Feb (165)	Mar (229)	Apr (219)	May (134)	Jun (119)	Jul (134)	Aug (236)	Sep (203)	Oct (215)	Nov (300)	Dec (140)
2017	Jan (188)	Feb (20)	Mar (147)	Apr (198)	May (26)	Jun (21)	Jul (67)	Aug (219)	Sep (209)	Oct (194)	Nov (144)	Dec (99)
2018	Jan (139)	Feb (122)	Mar (116)	Apr (85)	May (232)	Jun (181)	Jul (190)	Aug (105)	Sep (92)	Oct (178)	Nov (105)	Dec (86)
2019	Jan (119)	Feb (79)	Mar (74)	Apr (117)	May (115)	Jun (307)	Jul (107)	Aug (131)	Sep (103)	Oct (60)	Nov (118)	Dec (70)
2020	Jan (114)	Feb (103)	Mar (77)	Apr (121)	May (193)	Jun (110)	Jul (214)	Aug (210)	Sep (179)	Oct (260)	Nov (237)	Dec (334)
2021	Jan (163)	Feb (186)	Mar (58)	Apr (81)	May (108)	Jun (175)	Jul (154)	Aug (180)	Sep (217)	Oct (204)	Nov (232)	Dec (190)
2022	Jan (253)	Feb (134)	Mar (229)	Apr (190)	May (125)	Jun (70)	Jul (8)	Aug (22)	Sep (19)	Oct (33)	Nov (94)	Dec (164)
2023	Jan (158)	Feb (366)	Mar (272)	Apr (109)	May (198)	Jun (226)	Jul (200)	Aug (94)	Sep (108)	Oct (62)	Nov (175)	Dec (116)
2024	Jan (35)	Feb (40)	Mar (51)	Apr (89)	May (24)	Jun (26)	Jul (53)	Aug (71)	Sep (23)	Oct (11)	Nov (22)	Dec (58)
2025	Jan (26)	Feb (40)	Mar (107)	Apr (39)	May (35)	Jun (20)	Jul (11)	Aug (24)	Sep (35)	Oct (19)	Nov	Dec

vice-emu-commit Mailing List for VICE

Versatile Commodore Emulator

vice-emu-commit — Commit notifications for the source server