diff --git a/src/about.c b/src/about.c index f254ee6..83522f5 100644 --- a/src/about.c +++ b/src/about.c @@ -17,14 +17,14 @@ void activate_about( gtk_show_about_dialog( w, - "program-name", "ALSA Scarlett Gen 2/3 Control Panel", + "program-name", "ALSA Scarlett2 Control Panel", "version", "Version " VERSION, - "comments", "GTK4 interface to the ALSA Scarlett Gen 2/3 Mixer controls", + "comments", "GTK4 interface to the ALSA Scarlett and Clarett Mixer controls", "website", "https://github.com/geoffreybennett/alsa-scarlett-gui", "copyright", "Copyright 2022-2024 Geoffrey D. Bennett", "license-type", GTK_LICENSE_GPL_3_0, "logo-icon-name", "alsa-scarlett-gui-logo", - "title", "About ALSA Scarlett Mixer Interface", + "title", "About ALSA Scarlett2 Mixer Interface", "authors", authors, NULL ); diff --git a/src/iface-none.c b/src/iface-none.c index 495859d..655fbbe 100644 --- a/src/iface-none.c +++ b/src/iface-none.c @@ -11,14 +11,14 @@ GtkWidget *create_window_iface_none(GtkApplication *app) { GtkWidget *picture = gtk_picture_new_for_resource( "/vu/b4/alsa-scarlett-gui/icons/alsa-scarlett-gui-logo.png" ); - GtkWidget *label = gtk_label_new("No Scarlett Gen 2/3 interface found."); + GtkWidget *label = gtk_label_new("No Scarlett/Clarett interface found."); gtk_box_append(GTK_BOX(box), picture); gtk_box_append(GTK_BOX(box), label); GtkWidget *w = gtk_application_window_new(app); gtk_window_set_resizable(GTK_WINDOW(w), FALSE); - gtk_window_set_title(GTK_WINDOW(w), "ALSA Scarlett Gen 2/3 Control Panel"); + gtk_window_set_title(GTK_WINDOW(w), "ALSA Scarlett2 Control Panel"); gtk_window_set_child(GTK_WINDOW(w), box); gtk_application_window_set_show_menubar( GTK_APPLICATION_WINDOW(w), TRUE diff --git a/src/iface-unknown.c b/src/iface-unknown.c index ab40098..c7abda6 100644 --- a/src/iface-unknown.c +++ b/src/iface-unknown.c @@ -8,19 +8,21 @@ GtkWidget *create_iface_unknown_main(void) { GtkWidget *label = gtk_label_new( "Sorry, I don’t recognise the controls on this card.\n\n" - "These Focusrite Scarlett models should be supported:\n" + "These Focusrite models should be supported:\n" "– Gen 2: 6i6/18i8/18i20\n" - "– Gen 3: Solo/2i2/4i4/8i6/18i8/18i20\n\n" + "– Gen 3: Solo/2i2/4i4/8i6/18i8/18i20\n" + "– Gen 4: Solo/2i2/4i4\n" + "– Clarett USB and Clarett+ 2Pre/4Pre/8Pre\n\n" - "Are you running a recent kernel with Scarlett Gen 2/3 support " + "Are you running a recent kernel with Scarlett2 support " "enabled?\n\n" - "Check dmesg output for “Focusrite Scarlett Gen 2/3 Mixer " - "Driver”:\n\n" + "Check dmesg output for “Focusrite ... Mixer Driver”:\n\n" - "dmesg | grep Scarlett\n\n" + "dmesg | grep -A 5 -B 5 -i focusrite\n\n" - "You may need to create a file /etc/modprobe.d/scarlett.conf\n" + "For kernels before 6.7 you may need to create a file\n" + "/etc/modprobe.d/scarlett.conf\n" "with an “options snd_usb_audio ...” line and reboot." ); gtk_widget_set_margin(label, 30); diff --git a/src/vu.b4.alsa-scarlett-gui.desktop.template b/src/vu.b4.alsa-scarlett-gui.desktop.template index 1e0901a..5c328fa 100644 --- a/src/vu.b4.alsa-scarlett-gui.desktop.template +++ b/src/vu.b4.alsa-scarlett-gui.desktop.template @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Name=ALSA Scarlett Gen 2/3 Control Panel +Name=ALSA Scarlett2 Control Panel Icon=vu.b4.alsa-scarlett-gui Exec=PREFIX/bin/alsa-scarlett-gui Categories=GTK;AudioVideo;Audio;Mixer;