← Back to branch summary

~ubuntu-branches/ubuntu/precise/guayadeque/precise

« back to all changes in this revision

Viewing changes to src/FileRenamer.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2011-05-14 15:08:03 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110514150803-8b5evqetnaj35j34
Tags: 0.3.1~dfsg0-1
* New upstream release.
* Strip wxsqlite3 stuff out of upstream's tarballs.
* Update get-orig-source target in debian/rules.
* Update gbp config file.
* Bump Standards.
* Build-depend on libwxsqlite3-2.8-dev
* Enable parallel builds.
* Link binaries against the system-wide copy of wxsqlite3.
* Point sources to the correct wxcurl's headers location.
* Update copyright file as per DEP-5
* Improve debian/watch to handle the ~dfsg\d* suffix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/FileRenamer.cpp
1
1
// -------------------------------------------------------------------------------- //
2
 
//      Copyright (C) 2008-2010 J.Rios
 
2
//      Copyright (C) 2008-2011 J.Rios
3
3
//      anonbeat@gmail.com
4
4
//
5
5
//    This Program is free software; you can redistribute it and/or modify
6
6
//    it under the terms of the GNU General Public License as published by
7
 
//    the Free Software Foundation; either version 2, or (at your option)
 
7
//    the Free Software Foundation; either version 3, or (at your option)
8
8
//    any later version.
9
9
//
10
10
//    This Program is distributed in the hope that it will be useful,
228
228
                        else
229
229
                        {
230
230
                            //guLogMessage( wxT( "Reading tags from the file..." ) );
231
 
                            guTagInfo * TagInfo = guGetTagInfoHandler( FileName );
232
 
                            if( TagInfo )
 
231
                            if( Track->ReadFromFile( FileName ) )
233
232
                            {
234
233
                                Track->m_Type = guTRACK_TYPE_NOTDB;
235
 
 
236
 
                                TagInfo->Read();
237
 
 
238
 
                                Track->m_ArtistName  = TagInfo->m_ArtistName;
239
 
                                Track->m_AlbumName   = TagInfo->m_AlbumName;
240
 
                                Track->m_SongName    = TagInfo->m_TrackName;
241
 
                                Track->m_Number      = TagInfo->m_Track;
242
 
                                Track->m_GenreName   = TagInfo->m_GenreName;
243
 
                                Track->m_Length      = TagInfo->m_Length;
244
 
                                Track->m_Year        = TagInfo->m_Year;
245
 
                                Track->m_Rating      = wxNOT_FOUND;
246
 
                                Track->m_CoverId     = 0;
247
 
 
248
 
                                delete TagInfo;
249
234
                            }
250
235
                            else
251
236
                            {
267
252
                                    wxT( '.' ) + FileName.AfterLast( wxT( '.' ) );
268
253
                    }
269
254
 
270
 
                    FileName = guExpandTrackMacros( FileName, Track );
 
255
                    FileName = guExpandTrackMacros( FileName, Track, Index );
271
256
 
272
257
                    m_FilesListBox->SetString( Selection[ Index ], FileName );
273
258