Revision: 1627
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1627&view=rev
Author: tiffman
Date: 2007-07-06 19:20:56 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Added a read-only checkbox to the Misc tab in the Details window to show the
state of
the gapless track flag.
Modified Paths:
--------------
gtkpod/branches/gapless_playback/ChangeLog_detailed
gtkpod/branches/gapless_playback/data/gtkpod.glade
gtkpod/branches/gapless_playback/src/details.c
gtkpod/branches/gapless_playback/src/display.h
gtkpod/branches/gapless_playback/src/file.c
gtkpod/branches/gapless_playback/src/misc_conversion.c
gtkpod/branches/gapless_playback/src/misc_track.c
Modified: gtkpod/branches/gapless_playback/ChangeLog_detailed
===================================================================
--- gtkpod/branches/gapless_playback/ChangeLog_detailed 2007-07-05 15:46:35 UTC
(rev 1626)
+++ gtkpod/branches/gapless_playback/ChangeLog_detailed 2007-07-07 02:20:56 UTC
(rev 1627)
@@ -1,3 +1,14 @@
+2007-07-06 Michael Tiffany <tiffman at users.sourceforge.net>
+
+ * src/display.h
+ src/misc_conversion.c
+ src/misc_track.c
+ src/file.c
+ src/details.c
+ data/gtkpod.glade:
+ added a read-only checkbox to the Misc tab in the Details window to
+ show the state of the gapless track flag.
+
2007-07-02 Michael Tiffany <tiffman at users.sourceforge.net>
* src/mp3file.c: created struct to store the lame tag, and a function to
Modified: gtkpod/branches/gapless_playback/data/gtkpod.glade
===================================================================
--- gtkpod/branches/gapless_playback/data/gtkpod.glade 2007-07-05 15:46:35 UTC
(rev 1626)
+++ gtkpod/branches/gapless_playback/data/gtkpod.glade 2007-07-07 02:20:56 UTC
(rev 1627)
@@ -17187,6 +17187,56 @@
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel"
id="details_label_54">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">label</property>
+ <property
name="use_underline">False</property>
+ <property
name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">12</property>
+ <property
name="bottom_attach">13</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton"
id="details_checkbutton_54">
+ <property name="visible">True</property>
+ <property
name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes"></property>
+ <property
name="use_underline">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property
name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property
name="inconsistent">False</property>
+ <property
name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">12</property>
+ <property
name="bottom_attach">13</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
Modified: gtkpod/branches/gapless_playback/src/details.c
===================================================================
--- gtkpod/branches/gapless_playback/src/details.c 2007-07-05 15:46:35 UTC
(rev 1626)
+++ gtkpod/branches/gapless_playback/src/details.c 2007-07-07 02:20:56 UTC
(rev 1627)
@@ -761,6 +761,7 @@
case T_CHECKED:
case T_REMEMBER_PLAYBACK_POSITION:
case T_SKIP_WHEN_SHUFFLING:
+ case T_GAPLESS_TRACK_FLAG:
buf = g_strdup_printf ("details_checkbutton_%d", item);
w = gtkpod_xml_get_widget (detail->xml, buf);
g_signal_connect (w, "toggled",
@@ -967,6 +968,17 @@
gtk_combo_box_set_active (GTK_COMBO_BOX (w), index);
}
break;
+ case T_GAPLESS_TRACK_FLAG:
+ if ((w = gtkpod_xml_get_widget (detail->xml, checkbutton)))
+ {
+ if (track)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
+ track->gapless_track_flag);
+ else
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
+ FALSE);
+ }
+ break;
case T_ALL:
case T_ITEM_NUM:
/* cannot happen because of assertion above */
@@ -1187,6 +1199,7 @@
case T_IPOD_PATH:
case T_IPOD_ID:
case T_THUMB_PATH:
+ case T_GAPLESS_TRACK_FLAG:
/* These are read-only only */
break;
break;
Modified: gtkpod/branches/gapless_playback/src/display.h
===================================================================
--- gtkpod/branches/gapless_playback/src/display.h 2007-07-05 15:46:35 UTC
(rev 1626)
+++ gtkpod/branches/gapless_playback/src/display.h 2007-07-07 02:20:56 UTC
(rev 1627)
@@ -256,6 +256,7 @@
T_SORT_ALBUMARTIST,
T_SORT_COMPOSER,
T_SORT_TVSHOW,
+ T_GAPLESS_TRACK_FLAG,
T_ITEM_NUM,
} T_item;
Modified: gtkpod/branches/gapless_playback/src/file.c
===================================================================
--- gtkpod/branches/gapless_playback/src/file.c 2007-07-05 15:46:35 UTC (rev
1626)
+++ gtkpod/branches/gapless_playback/src/file.c 2007-07-07 02:20:56 UTC (rev
1627)
@@ -856,6 +856,7 @@
case T_TRANSFERRED:
case T_PLAYCOUNT:
case T_VOLUME:
+ case T_GAPLESS_TRACK_FLAG:
/* not applicable */
break;
case T_ITEM_NUM:
Modified: gtkpod/branches/gapless_playback/src/misc_conversion.c
===================================================================
--- gtkpod/branches/gapless_playback/src/misc_conversion.c 2007-07-05
15:46:35 UTC (rev 1626)
+++ gtkpod/branches/gapless_playback/src/misc_conversion.c 2007-07-07
02:20:56 UTC (rev 1627)
@@ -110,6 +110,7 @@
N_("Sort Album Artist"),
N_("Sort Composer"),
N_("Sort TV Show"),
+ N_("Gapless Track Flag"),
NULL };
/* Tooltips for prefs window */
@@ -169,7 +170,8 @@
N_("Used for sorting on the iPod"), /* 50 */
N_("Used for sorting on the iPod"),
N_("Used for sorting on the iPod"),
- N_("Used for sorting on the iPod")
+ N_("Used for sorting on the iPod"),
+ NULL
};
Modified: gtkpod/branches/gapless_playback/src/misc_track.c
===================================================================
--- gtkpod/branches/gapless_playback/src/misc_track.c 2007-07-05 15:46:35 UTC
(rev 1626)
+++ gtkpod/branches/gapless_playback/src/misc_track.c 2007-07-07 02:20:56 UTC
(rev 1627)
@@ -909,6 +909,7 @@
case T_MEDIA_TYPE:
case T_SEASON_NR:
case T_EPISODE_NR:
+ case T_GAPLESS_TRACK_FLAG:
case T_ITEM_NUM:
g_return_val_if_reached (NULL);
}
@@ -1203,6 +1204,13 @@
changed = TRUE;
}
break;
+ case T_GAPLESS_TRACK_FLAG:
+ if (frtrack->gapless_track_flag != totrack->gapless_track_flag)
+ {
+ totrack->gapless_track_flag = frtrack->gapless_track_flag;
+ changed = TRUE;
+ }
+ break;
case T_ITEM_NUM:
case T_ALL:
g_return_val_if_reached (FALSE);
@@ -1408,6 +1416,7 @@
case T_ALL:
case T_CHECKED:
case T_ITEM_NUM:
+ case T_GAPLESS_TRACK_FLAG:
break;
}
return text;
@@ -1674,6 +1683,7 @@
case T_SKIP_WHEN_SHUFFLING:
case T_CHECKED:
case T_ALL:
+ case T_GAPLESS_TRACK_FLAG:
case T_ITEM_NUM:
case T_THUMB_PATH: // TODO: this should in fact be settable
gtkpod_warning ("Programming error: track_set_text() called with
illegal argument (item: %d)\n", item);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
