Merge branch 'master' into mythtv-rec2

Conflicts: mythtv/libs/libmythtv/channelbase.cpp mythtv/programs/mythbackend/mainserver.h
MythTV · Jul 20, 2011 · b026525 · b026525
2 parents 6172413 + 48079bb
commit b026525
Show file tree

Hide file tree

Showing 153 changed files with 6,627 additions and 3,011 deletions.
diff --git a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro
@@ -29,4 +29,4 @@ LIBS += -lmythavcodec
 LIBS += -lmythavutil
 LIBS += -lz
 
-QT += xml sql opengl
+QT += xml sql opengl network
diff --git a/mythplugins/mythmusic/mythmusic/cddecoder.cpp b/mythplugins/mythmusic/mythmusic/cddecoder.cpp
@@ -16,6 +16,7 @@ using namespace std;
 #include <audiooutput.h>
 #include <mythcontext.h>
 #include <mythmediamonitor.h>
+#include <util.h>
 
 extern "C" {
 #include <libavcodec/avcodec.h>

diff --git a/mythplugins/mythmusic/mythmusic/cdrip.cpp b/mythplugins/mythmusic/mythmusic/cdrip.cpp
@@ -1370,14 +1370,25 @@ void Ripper::showEditMetadataDialog(MythUIButtonListItem *item)
 
     Metadata *editMeta = qVariantValue<Metadata *>(item->GetData());
 
-    EditMetadataDialog editDialog(editMeta, GetMythMainWindow(),
-                                  "edit_metadata", "music-", "edit metadata");
-    editDialog.setSaveMetadataOnly();
+    MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+
+    EditMetadataDialog *editDialog = new EditMetadataDialog(mainStack, editMeta);
+    editDialog->setSaveMetadataOnly();
 
-    if (kDialogCodeRejected != editDialog.exec())
+    if (!editDialog->Create())
     {
-        updateTrackList();
+        delete editDialog;
+        return;
     }
+
+    connect(editDialog, SIGNAL(metadataChanged()), this, SLOT(metadataChanged()));
+
+    mainStack->AddScreen(editDialog);
+}
+
+void Ripper::metadataChanged(void)
+{
+    updateTrackList();
 }
 
 void Ripper::toggleTrackActive(MythUIButtonListItem *item)

diff --git a/mythplugins/mythmusic/mythmusic/cdrip.h b/mythplugins/mythmusic/mythmusic/cdrip.h
@@ -112,6 +112,7 @@ class Ripper : public MythScreenType
     void showEditMetadataDialog(MythUIButtonListItem *);
     void EjectFinished(void);
     void ScanFinished(void);
+    void metadataChanged(void);
 
   signals:
     void ripFinished(void);