Correct support for multiply clients

[qtrapids] / src / engine / QBittorrentSession.cpp

diff --git a/src/engine/QBittorrentSession.cpp b/src/engine/QBittorrentSession.cpp
index dd94f95..2ab40ed 100644 (file)
--- a/src/engine/QBittorrentSession.cpp
+++ b/src/engine/QBittorrentSession.cpp
@@ -23,7 +23,8 @@
 #include "AlertWaiterThread.h"
 #include "QBittorrentSession.h"
 
-
+namespace qtrapids {
+       
 QBittorrentSession::QBittorrentSession(QObject *parent):
                QObject(parent),
                btSession_(),
@@ -31,7 +32,7 @@ QBittorrentSession::QBittorrentSession(QObject *parent):
 {
        alertWaiter_ = new AlertWaiterThread(&btSession_, this);
        alertWaiter_->allAlerts();
-       connect(alertWaiter_, SIGNAL(alert(TorrentAlert const*)), this, SLOT(on_alert(TorrentAlert const*)));
+       connect(alertWaiter_, SIGNAL(alert(Alert const*)), this, SLOT(on_alert(Alert const*)));
        alertWaiter_->start();
 }
 
@@ -41,26 +42,36 @@ QBittorrentSession::~QBittorrentSession()
 }
 
 
-std::auto_ptr<QTorrentHandle> 
+qtrapids::QTorrentHandle
 QBittorrentSession::addTorrent(AddTorrentParams const& params)
 {
        // Delegate to Libtorrent and return QTorrentHandle.
-       std::auto_ptr<QTorrentHandle> handlePtr(new QTorrentHandle(btSession_.add_torrent(params)));
-       return handlePtr;
+       //std::auto_ptr<QTorrentHandle> handlePtr(new QTorrentHandle(btSession_.add_torrent(params)));
+       qtrapids::QTorrentHandle  handle = qtrapids::QTorrentHandle(btSession_.add_torrent(params));
+       return handle;
+}
+
+
+void QBittorrentSession::removeTorrent(qtrapids::QTorrentHandle const& handle) 
+{
+       btSession_.remove_torrent(handle.getHandle());
 }
 
 
 // ========================== SLOTS ==============================
-void QBittorrentSession::on_alert(TorrentAlert const *al) 
+/// @TODO This function is called when AlertWaiterThread emits alert()
+/// If connection is direct, as it is now, we need to use QMutex here (if necessary?)
+void QBittorrentSession::on_alert(Alert const *al) 
                //NOTE: al parameter not necessarily needed here, as we pop_alert() now!
 {
        
-       //qDebug() << "QBittorrentSession:on_alert(" << al << ")";
-//     if (al)
-//             qDebug() << "on_alert():" << QString::fromStdString(al->message());
-       
-       std::auto_ptr<TorrentAlert> alertPtr = btSession_.pop_alert();
+#ifdef QTRAPIDS_DEBUG
+       if (al)
+               qDebug() << "on_alert():" << QString::fromStdString(al->message());
+#endif
+
+       std::auto_ptr<Alert> alertPtr = btSession_.pop_alert();
        emit alert(alertPtr);
 }
 
-
+} //namespace qtrapids