← Back to branch summary

~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to src/brasero-split-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-08-31 15:25:44 UTC
  • mfrom: (1.1.43 upstream)
  • Revision ID: james.westby@ubuntu.com-20100831152544-9lfh5n4atqc91i26
Tags: 2.31.91-0ubuntu1
* New upstream release
* debian/control:
  - Bump build-depends on libglib2.0-dev, libgconf2-dev
  - Drop build-depend on libunique
* debian/rules:
* debian/libbrasero-media0.install:
* debian/libbrasero-media1.install:
  - Update shlibs for libbrasero-media1
* debian/brasero-common.install:
  - Install gsettings files
* debian/libbrasero-media0.install:
* debian/rules:
* debian/patches/01_pkglibdir.patch:
  - Remove versioned plugin directory - the upstream build system has changed
* debian/patches/013_gsettings_backend.patch:
  - Remove hardcoded gconf gsettings backend
* debian/patches/014_plugin_directory.patch:
  - Fix plugin directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/brasero-split-dialog.c
38
38
#include "brasero-track-stream.h"
39
39
 
40
40
#include "brasero-split-dialog.h"
41
 
#include "brasero-player.h"
 
41
#include "brasero-song-control.h"
42
42
#include "brasero-utils.h"
43
43
 
44
44
enum {
85
85
 
86
86
void
87
87
brasero_split_dialog_set_uri (BraseroSplitDialog *self,
88
 
                              const gchar *uri)
 
88
                              const gchar *uri,
 
89
                              const gchar *title,
 
90
                              const gchar *artist)
89
91
{
90
92
        BraseroSplitDialogPrivate *priv;
91
93
 
92
94
        priv = BRASERO_SPLIT_DIALOG_PRIVATE (self);
93
 
        brasero_player_set_uri (BRASERO_PLAYER (priv->player), uri);
 
95
        brasero_song_control_set_uri (BRASERO_SONG_CONTROL (priv->player), uri);
 
96
        brasero_song_control_set_info (BRASERO_SONG_CONTROL (priv->player), title, artist);
94
97
}
95
98
 
96
99
void
114
117
        priv->start = start;
115
118
        priv->end = end;
116
119
 
117
 
        brasero_player_set_boundaries (BRASERO_PLAYER (priv->player),
118
 
                                       priv->start,
119
 
                                       priv->end);
 
120
        brasero_song_control_set_boundaries (BRASERO_SONG_CONTROL (priv->player),
 
121
                                             priv->start,
 
122
                                             priv->end);
120
123
}
121
124
 
122
125
GSList *
211
214
 
212
215
                /* nothing in the tree yet */
213
216
                if (priv->end <= 0)
214
 
                        end = brasero_player_get_length (BRASERO_PLAYER (priv->player));
 
217
                        end = brasero_song_control_get_length (BRASERO_SONG_CONTROL (priv->player));
215
218
                else
216
219
                        end = priv->end;
217
220
 
733
736
                gint64 pos;
734
737
 
735
738
                /* this one is before since it doesn't wipe all slices */
736
 
                pos = brasero_player_get_pos (BRASERO_PLAYER (priv->player));
 
739
                pos = brasero_song_control_get_pos (BRASERO_SONG_CONTROL (priv->player));
737
740
                brasero_split_dialog_cut (self, pos + priv->start, TRUE);
738
741
                return;
739
742
        }
798
801
                          G_CALLBACK (brasero_split_dialog_metadata_finished_cb),
799
802
                          self);
800
803
        brasero_metadata_get_info_async (priv->metadata,
801
 
                                         brasero_player_get_uri (BRASERO_PLAYER (priv->player)),
 
804
                                         brasero_song_control_get_uri (BRASERO_SONG_CONTROL (priv->player)),
802
805
                                         BRASERO_METADATA_FLAG_SILENCES);
803
806
 
804
807
        /* stop anything from playing and grey out things */
1103
1106
        gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
1104
1107
        gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
1105
1108
 
1106
 
        priv->player = brasero_player_new ();
 
1109
        priv->player = brasero_song_control_new ();
1107
1110
        gtk_widget_show (priv->player);
1108
1111
        gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), priv->player, NULL);
1109
1112