[Goodies-commits] r5342 - in xfburn/trunk: . xfburn
David Mohr
squisher at xfce.org
Tue Sep 2 02:21:51 CEST 2008
Author: squisher
Date: 2008-09-02 00:21:51 +0000 (Tue, 02 Sep 2008)
New Revision: 5342
Modified:
xfburn/trunk/NEWS
xfburn/trunk/README
xfburn/trunk/xfburn/xfburn-audio-composition.c
Log:
* Updating README, NEWS
* Remove artist and title columns from audio composition for now
Modified: xfburn/trunk/NEWS
===================================================================
--- xfburn/trunk/NEWS 2008-09-02 00:04:15 UTC (rev 5341)
+++ xfburn/trunk/NEWS 2008-09-02 00:21:51 UTC (rev 5342)
@@ -1,6 +1,7 @@
xfburn 0.3.3 (2008-XX-XX)
============-------------
+- Burn audio CDs from uncompressed CD audio .wav files
- Allow drags and drop from file managers like Thunar (text/uri-list target)
- Require HAL if compiled with HAL support
- Try to unmount a drive if it is not accessible (requires thunar-vfs)
Modified: xfburn/trunk/README
===================================================================
--- xfburn/trunk/README 2008-09-02 00:04:15 UTC (rev 5341)
+++ xfburn/trunk/README 2008-09-02 00:21:51 UTC (rev 5342)
@@ -26,6 +26,20 @@
* Blank discs
* Format and deformat DVD-RW discs
+----------------------
+Experimential Features
+----------------------
+
+ * Audio CD support
+Now included is some very basic audio CD support. Right now only CD-quality,
+uncompressed (PCM) Wave files can be added to an audio compilation. Use i.e.
+your favority audio player with a disc writer output mode / plugin to
+decompress your existing audio files. If .wav files are added to the
+compilation, their headers get checked to make sure they are of the right
+format. Note that this check is not very well tested (in particular it's not
+likely to work on big-endian machines like PowerPC), since it is likely to
+get replaced in the near future.
+
==============================================================================
Requirements
------------
Modified: xfburn/trunk/xfburn/xfburn-audio-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-audio-composition.c 2008-09-02 00:04:15 UTC (rev 5341)
+++ xfburn/trunk/xfburn/xfburn-audio-composition.c 2008-09-02 00:21:51 UTC (rev 5342)
@@ -72,6 +72,18 @@
AUDIO_COMPOSITION_N_COLUMNS
};
+enum
+{
+ AUDIO_COMPOSITION_DISPLAY_COLUMN_POS,
+ AUDIO_COMPOSITION_DISPLAY_COLUMN_LENGTH,
+#if 0 // Needs libburn cd-text suppport
+ AUDIO_COMPOSITION_DISPLAY_COLUMN_ARTIST,
+ AUDIO_COMPOSITION_DISPLAY_COLUMN_TITLE,
+#endif
+ AUDIO_COMPOSITION_DISPLAY_COLUMN_PATH,
+ AUDIO_COMPOSITION_DISPLAY_N_COLUMNS
+};
+
typedef enum
{
AUDIO_COMPOSITION_TYPE_RAW,
@@ -124,8 +136,10 @@
static void cb_selection_changed (GtkTreeSelection *selection, XfburnAudioComposition * dc);
static GSList * generate_audio_src (XfburnAudioComposition * ac);
static void cb_begin_burn (XfburnDiscUsage * du, XfburnAudioComposition * dc);
+#if 0 // Needs libburn cd-text suppport
static void cb_cell_artist_edited (GtkCellRenderer * renderer, gchar * path, gchar * newtext, XfburnAudioComposition * dc);
static void cb_cell_title_edited (GtkCellRenderer * renderer, gchar * path, gchar * newtext, XfburnAudioComposition * dc);
+#endif
static void cb_content_drag_data_rcv (GtkWidget * widget, GdkDragContext * dc, guint x, guint y, GtkSelectionData * sd,
guint info, guint t, XfburnAudioComposition * composition);
@@ -272,8 +286,10 @@
//GtkWidget *hbox, *label;
GtkWidget *scrolled_window;
GtkTreeStore *model;
+#if 0 // Needs libburn cd-text suppport
GtkTreeViewColumn *column_artist, *column_title;
GtkCellRenderer *cell_artist, *cell_title;
+#endif
GtkTreeSelection *selection;
GtkAction *action = NULL;
GdkScreen *screen;
@@ -358,12 +374,14 @@
gtk_widget_show (priv->content);
gtk_container_add (GTK_CONTAINER (scrolled_window), priv->content);
+
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->content), -1, _("Pos"),
gtk_cell_renderer_text_new (), "text", AUDIO_COMPOSITION_COLUMN_POS, NULL);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->content), -1, _("Length"),
gtk_cell_renderer_text_new (), "text", AUDIO_COMPOSITION_COLUMN_HUMANLENGTH, NULL);
/*gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->content), -1, _("Artist"),
gtk_cell_renderer_text_new (), "text", AUDIO_COMPOSITION_COLUMN_ARTIST, NULL);*/
+#if 0 // Needs libburn cd-text suppport
column_artist = gtk_tree_view_column_new ();
gtk_tree_view_column_set_title (column_artist, _("Artist"));
@@ -387,24 +405,27 @@
g_object_set (G_OBJECT (cell_title), "editable", TRUE, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (priv->content), column_title);
+#endif
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->content), -1, _("Filename"),
gtk_cell_renderer_text_new (), "text", AUDIO_COMPOSITION_COLUMN_PATH, NULL);
/* Position */
- gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), 0), FALSE);
- gtk_tree_view_column_set_min_width (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), 0), 20);
+ gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), AUDIO_COMPOSITION_DISPLAY_COLUMN_POS), FALSE);
+ gtk_tree_view_column_set_min_width (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), AUDIO_COMPOSITION_DISPLAY_COLUMN_POS), 20);
/* Length */
- gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), 1), FALSE);
- gtk_tree_view_column_set_min_width (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), 1), 60);
+ gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), AUDIO_COMPOSITION_DISPLAY_COLUMN_LENGTH), FALSE);
+ gtk_tree_view_column_set_min_width (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), AUDIO_COMPOSITION_DISPLAY_COLUMN_LENGTH), 60);
+#if 0 // Needs libburn cd-text suppport
/* Artist */
- gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), 2), TRUE);
- gtk_tree_view_column_set_min_width (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), 2), 80);
+ gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), AUDIO_COMPOSITION_DISPLAY_COLUMN_ARTIST), TRUE);
+ gtk_tree_view_column_set_min_width (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), AUDIO_COMPOSITION_DISPLAY_COLUMN_ARTIST), 80);
/* Song Name */
- gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), 3), TRUE);
- gtk_tree_view_column_set_min_width (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), 3), 100);
+ gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), AUDIO_COMPOSITION_DISPLAY_COLUMN_TITLE), TRUE);
+ gtk_tree_view_column_set_min_width (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), AUDIO_COMPOSITION_DISPLAY_COLUMN_TITLE), 100);
+#endif
/* Local Path (PATH) column */
- gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), 4), TRUE);
+ gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (GTK_TREE_VIEW (priv->content), AUDIO_COMPOSITION_DISPLAY_COLUMN_PATH), TRUE);
g_signal_connect (G_OBJECT (priv->content), "button-press-event",
@@ -665,6 +686,7 @@
return FALSE;
}
+#if 0 // Needs libburn cd-text suppport
static void
cb_cell_artist_edited (GtkCellRenderer * renderer, gchar * path, gchar * newtext, XfburnAudioComposition * dc)
{
@@ -702,6 +724,7 @@
gtk_tree_path_free (real_path);
}
+#endif
static void
tracks_changed (XfburnAudioComposition *ac)
More information about the Goodies-commits
mailing list