Changeset 279 for trunk/fm_gui/src/marlin-window.c

Timestamp:

01/08/09 22:42:50 (3 years ago)

Author:

ath

Message:

Some initial improvements to FmGui's Marlin widget.

Files:

• trunk/fm_gui/src/marlin-window.c (modified) (14 diffs)

trunk/fm_gui/src/marlin-window.c

@@ -40 +40 @@
 #include <libgnomevfs/gnome-vfs-mime.h>
 
-//#include <gconf/gconf-client.h>
-
-#ifdef HAVE_MEDIA_PROFILES
-#include <profiles/gnome-media-profiles.h>
-#endif
-
 #include <marlin/marlin-sample.h>
 #include <marlin/marlin-sample-selection.h>
@@ -53 +47 @@
 
 #include <marlin/marlin-load-pipeline.h>
-//#include <marlin/marlin-save-pipeline.h>
-//#include <marlin/marlin-jack-play.h>
 
 #include <marlin/marlin-file-utils.h>
@@ -65 +57 @@
 #include <marlin/marlin-a11y-helper.h>
 #include <marlin/marlin-x-utils.h>
-//#include <marlin/marlin-cross-fader.h>
 #include <marlin/marlin-undo-manager.h>
 #include <marlin/marlin-level-ruler.h>
-//#include <marlin/marlin-plugin.h>
 #include <marlin/marlin-base-window.h>
 #include <marlin/marlin-progress-dialog.h>
 #include <marlin/marlin-gst-extras.h>
-//#include <marlin/marlin-file-chooser.h>
-
-/*#include <dialogs/marlin-information-dialog.h>
-#include <dialogs/marlin-adjust-channel-dialogs.h>
-#include <dialogs/marlin-mp3-dialog.h>
-#include <dialogs/marlin-vorbis-dialog.h>
-
-#include <dialogs/marlin-crossfade-dialog.h>
-#include <dialogs/marlin-select-region-dialog.h>
-#include <dialogs/marlin-undo-history-dialog.h>
-#include <dialogs/marlin-edit-marker-dialog.h>
-#include <dialogs/marlin-add-marker-dialog.h>
-#include <dialogs/marlin-move-cursor-dialog.h>*/
+
 
 #include <marlin/marlin-beatsection-model.h>
 
 //#include <other/gtkvumeter.h>
-
-//#include <marlin-toolbar.h>
-
-//#include "main.h"
 
 #include "global.h"
@@ -106 +80 @@
         PROP_0,
         PROP_SAMPLE,
+        PROP_CDJ
 };
 
@@ -168 +143 @@
         GtkActionGroup *ui_action, *popup_action;
         GObject *ui_merge;
-
-//      MarlinJackPlay *jack;
         
         MarlinState state;
@@ -184 +157 @@
         guint clip_id; /* Signal handler for listening to the clipboard */
 
-        /* Dialogs */
-        GtkWidget *select_region_dialog;
-        GtkWidget *move_cursor_dialog;
-        GtkWidget *properties_dialog;
-        GtkWidget *xfade_dialog;
-        GtkWidget *adjust_channels_dialog;
-        GtkWidget *undo_history_dialog;
-        GtkWidget *edit_marker_dialog;
-        GtkWidget *add_marker_dialog;
-        
-        time_t last_save; /* Time of the last save, in seconds */
-
         GtkWidget *meters_event; /* Event box that holds the meters */
         GtkWidget *left_vu, *right_vu;
@@ -202 +163 @@
         gboolean mv_in_marker;
         MarlinMarker *current_marker;
+
+//      FmCDJData *cdj;
 };
 
@@ -250 +213 @@
         }
 
-/*      if (priv->select_region_dialog != NULL) {
-                gtk_widget_destroy (priv->select_region_dialog);
-        }*/
-
-/*      if (priv->move_cursor_dialog != NULL) {
-                gtk_widget_destroy (priv->move_cursor_dialog);
-        }*/
-
-/*      if (priv->properties_dialog != NULL) {
-                gtk_widget_destroy (priv->properties_dialog);
-        }*/
-        
-/*      if (priv->undo_history_dialog != NULL) {
-                gtk_widget_destroy (priv->undo_history_dialog);
-        }*/
-
-/*      if (priv->xfade_dialog != NULL) {
-                gtk_widget_destroy (priv->xfade_dialog);
-        }*/
-        
-/*      if (priv->adjust_channels_dialog != NULL) {
-                gtk_widget_destroy (priv->adjust_channels_dialog);
-        }*/
-
         g_free (priv);
         window->priv = NULL;
@@ -328 +267 @@
         }
 #endif
-/*      if (priv->jack != NULL) {
-                g_object_unref (priv->jack);
-                priv->jack = NULL;
-        }*/
 
         if (priv->undo != NULL) {
@@ -792 +727 @@
         MarlinWindowPrivate *priv;
         GtkUIManager *merge;
-//      GConfClient *client;
-//      GList *plugins;
         char *xml;
         
@@ -816 +749 @@
                             FALSE, TRUE, 0);
         
-/*      client = gconf_client_get_default ();
-        priv->position_display = gconf_client_get_int (client, 
-                                                       "/apps/marlin/system-state/position-display",
-                                                       NULL);
-        priv->show_vu = gconf_client_get_bool (client, 
-                                               "/apps/marlin/show-equalizers",
-                                               NULL);
-        g_object_unref (G_OBJECT (client));*/
-
         priv->close_on_op_complete = FALSE;
         priv->state = MARLIN_STATE_STOPPED;
@@ -856 +780 @@
         g_free (xml);
 
-        /* Merge all the plugins */
-        /*for (plugins = marlin_plugin_get_list (); plugins; plugins = plugins->next) {
-                MarlinPluginInfo *info = plugins->data;
-                MarlinPluginFuncs *funcs = info->funcs;
-
-                if (funcs->merge_ui) {
-                        funcs->merge_ui (merge, MARLIN_BASE_WINDOW (window));
-                }
-        }*/
-
         priv->accel_group = gtk_ui_manager_get_accel_group (merge);
         gtk_window_add_accel_group (GTK_WINDOW (window), priv->accel_group);
@@ -872 +786 @@
         g_object_unref (priv->accel_group);
         
-/*      priv->toolbar = toolbar_new (window);
-        gtk_widget_show (GTK_WIDGET (priv->toolbar));
-        gtk_box_pack_end (GTK_BOX (priv->menu_dock), GTK_WIDGET (priv->toolbar),
-                          FALSE, FALSE, 0);*/
-        
-        priv->last_save = time (NULL);
 }
 
@@ -1509 +1417 @@
 }
 
-/*static void
-display_no_jack_window (GtkWidget *window)
-{
-        GtkWidget *dialog;
-
-        dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (window),
-                                                     GTK_DIALOG_MODAL |
-                                                     GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                     GTK_MESSAGE_WARNING,
-                                                     GTK_BUTTONS_OK,
-                                                     _("<b>Unable to start JACK</b>"));
-        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                  _("Marlin requires JACK for its audio output, but JACK failed to start.\n\n"
-                                                    "Marlin will continue to run, but playback and recording features will be disabled"));
-        gtk_dialog_run (GTK_DIALOG (dialog));
-
-        gtk_widget_destroy (dialog);
-}*/
 
 MarlinWindow *
-marlin_window_new (void)
+marlin_window_new ()
 {
         MarlinProgram *program = marlin_program_get_default ();