Changeset 8dbb3f39280e6c97cfee687b266e64d63d96e420

Timestamp:

06/24/07 02:22:18 (1 year ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1182644538 +0000

git-parent:

[10b303d9799f411d2c185d963b4e8875e872e335]

git-author:

Rafaël Carré <funman@videolan.org> 1182644538 +0000

Message:

Reverts [20669]
Adds a button into qt4 media information to write modified meta data to the file

Files:

• include/vlc_common.h (modified) (1 diff)
• include/vlc_meta.h (modified) (1 diff)
• modules/gui/qt4/components/infopanels.cpp (modified) (2 diffs)
• modules/gui/qt4/components/infopanels.hpp (modified) (2 diffs)
• modules/gui/qt4/dialogs/mediainfo.cpp (modified) (1 diff)
• modules/meta_engine/taglib.cpp (modified) (2 diffs)

include/vlc_common.h

@@ -430 +430 @@
-/* divers */
-typedef struct vlc_meta_t    vlc_meta_t;
+typedef struct meta_export_t meta_export_t;
-
-/* Stats */

include/vlc_meta.h

@@ -228 +228 @@
-};
-
+struct meta_export_t
+{
+    input_item_t *p_item;
+    const char *psz_file;
+};
+
-#define VLC_META_ENGINE_TITLE           0x00000001
-#define VLC_META_ENGINE_ARTIST          0x00000004

modules/gui/qt4/components/infopanels.cpp

@@ -115 +115 @@
-    ADD_META_B( VLC_META_DESCRIPTION, description_text ); // Comment Two lines?
-
+    QPushButton *write = new QPushButton( qtr( "&Write" ) );
+    l->addWidget( write, line, 0 );
+
+    BUTTONACT( write, saveMeta() );
+
-    /*  ADD_META( TRACKID)  DO NOT SHOW it */
-    /*  ADD_URI - DO not show it, done outside */
@@ -126 +131 @@
-MetaPanel::~MetaPanel()
-{
+}
+
+void MetaPanel::saveMeta()
+{
+    playlist_t *p_playlist;
+
+    meta_export_t p_export;
+    p_export.p_item = p_input;
+
+    /* we can write meta data only in a file */
+    if( ( p_input->i_type == ITEM_TYPE_AFILE ) || \
+        ( p_input->i_type == ITEM_TYPE_VFILE ) )
+        /* some audio files are detected as video files */
+    {
+        char *psz_uri = p_input->psz_uri;
+        if( !strncmp( psz_uri, "file://", 7 ) )
+            psz_uri += 7; /* strlen("file://") = 7 */
+
+        p_export.psz_file = strndup( psz_uri, PATH_MAX );
+    }
+    else
+        return;
+
+    /* now we read the modified meta data */
+    free( p_input->p_meta->psz_artist );
+    p_input->p_meta->psz_artist = strdup( artist_text->text().toUtf8() );
+    free( p_input->p_meta->psz_album );
+    p_input->p_meta->psz_album = strdup( collection_text->text().toUtf8() );
+    free( p_input->p_meta->psz_genre );
+    p_input->p_meta->psz_genre = strdup( genre_text->text().toUtf8() );
+    free( p_input->p_meta->psz_date );
+    p_input->p_meta->psz_date = (char*) malloc(5);
+    snprintf( p_input->p_meta->psz_date, 5, "%d", date_text->value() );
+    free( p_input->p_meta->psz_tracknum );
+    p_input->p_meta->psz_tracknum = (char*) malloc(5);
+    snprintf( p_input->p_meta->psz_tracknum, 5, "%d", seqnum_text->value() );
+    free( p_input->p_meta->psz_title );
+    p_input->p_meta->psz_title = strdup(  title_text->text().toUtf8() );
+
+    p_playlist = pl_Yield( p_intf );
+
+    PL_LOCK;
+    p_playlist->p_private = &p_export;
+
+    module_t *p_mod = module_Need( p_playlist, "meta writer", NULL, 0 );
+    if( p_mod )
+        module_Unneed( p_playlist, p_mod );
+    PL_UNLOCK;
+    pl_Release( p_playlist );
-}
-

modules/gui/qt4/components/infopanels.hpp

@@ -54 +54 @@
-    MetaPanel( QWidget *, intf_thread_t * );
-    virtual ~MetaPanel();
+    input_item_t *p_input;
-private:
-    intf_thread_t *p_intf;
@@ -75 +76 @@
-    void update( input_item_t * );
-    void clear();
+    void saveMeta();
-signals:
-    void uriSet( QString );

modules/gui/qt4/dialogs/mediainfo.cpp

@@ -143 +143 @@
-                                                    bool update_meta )
-{
+    MP->p_input = p_item;
-    if( update_info )
-        IP->update( p_item );

modules/meta_engine/taglib.cpp

@@ -167 +167 @@
-}
-
+#define SET(a,b) if(b) tag->set##a( b );
+
-static int WriteMeta( vlc_object_t *p_this )
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    if( !f.isNull() && f.tag() )
-    {
-        TagLib::Tag *tag = f.tag();
-tag->setArtist(
+SET( Artist,
-        if( p_item->p_meta->psz_title )
-            tag->setTitle( p_item->p_meta->psz_title );
-        else
-            tag->setTitle( p_item->psz_name );
-tag->setAlbum(
-tag->setGenre(
+SET( Album,
+SET( Genre,
-        if( p_item->p_meta->psz_date )
-            tag->setYear( atoi( p_item->p_meta->psz_date ) );
@@ -197 +193 @@
-        return VLC_SUCCESS;
-    }
+    msg_Err( p_this, "File %s can't be opened for tag writing\n",
+        p_export->psz_file );
-    return VLC_EGENERIC;
-}