premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merged fixes from RC_0_12 branch

This commit is contained in:
Arvid Norberg 2007-03-16 07:59:04 +00:00
parent 029953c5ae
commit de69453826
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/manual.html
View File

@ -2663,7 +2663,7 @@ should be read, and <tt class="docutils literal"><span class="pre">length</span>
It will only be generated once per torrent. It contains a torrent_handle to the It will only be generated once per torrent. It contains a torrent_handle to the
torrent in question. This alert is generated as severity level <tt class="docutils literal"><span class="pre">info</span></tt>.</p> torrent in question. This alert is generated as severity level <tt class="docutils literal"><span class="pre">info</span></tt>.</p>
<pre class="literal-block"> <pre class="literal-block">
struct torrent_finished_alert:torrent_ alert struct torrent_finished_alert: torrent_alert
{ {
torrent_finished_alert( torrent_finished_alert(
const torrent_handle&amp; h const torrent_handle&amp; h
@ -2714,13 +2714,12 @@ struct metadata_received_alert: torrent_alert
files on disk did not match the fastresume file. The string explains the reason why the files on disk did not match the fastresume file. The string explains the reason why the
resume file was rejected. It is generated at severity level <tt class="docutils literal"><span class="pre">warning</span></tt>.</p> resume file was rejected. It is generated at severity level <tt class="docutils literal"><span class="pre">warning</span></tt>.</p>
<pre class="literal-block"> <pre class="literal-block">
struct fastresume_rejected_alert: alert struct fastresume_rejected_alert: torrent_alert
{ {
fastresume_rejected_alert(torrent_handle const&amp; h fastresume_rejected_alert(torrent_handle const&amp; h
, std::string const&amp; msg); , std::string const&amp; msg);
virtual std::auto_ptr&lt;alert&gt; clone() const; virtual std::auto_ptr&lt;alert&gt; clone() const;
torrent_handle handle;
}; };
</pre> </pre>
</div> </div>

5
docs/manual.rst
View File

@ -2742,7 +2742,7 @@ torrent in question. This alert is generated as severity level ``info``.
:: ::
struct torrent_finished_alert:torrent_ alert struct torrent_finished_alert: torrent_alert
{ {
torrent_finished_alert( torrent_finished_alert(
const torrent_handle& h const torrent_handle& h
@ -2802,13 +2802,12 @@ resume file was rejected. It is generated at severity level ``warning``.
:: ::
struct fastresume_rejected_alert: alert struct fastresume_rejected_alert: torrent_alert
{ {
fastresume_rejected_alert(torrent_handle const& h fastresume_rejected_alert(torrent_handle const& h
, std::string const& msg); , std::string const& msg);
virtual std::auto_ptr<alert> clone() const; virtual std::auto_ptr<alert> clone() const;
torrent_handle handle;
}; };

7
include/libtorrent/alert_types.hpp
View File

@ -249,18 +249,15 @@ namespace libtorrent
{ return std::auto_ptr<alert>(new listen_failed_alert(*this)); } { return std::auto_ptr<alert>(new listen_failed_alert(*this)); }
}; };
struct TORRENT_EXPORT fastresume_rejected_alert: alert struct TORRENT_EXPORT fastresume_rejected_alert: torrent_alert
{ {
fastresume_rejected_alert(torrent_handle const& h fastresume_rejected_alert(torrent_handle const& h
, std::string const& msg) , std::string const& msg)
: alert(alert::warning, msg) : torrent_alert(h, alert::warning, msg)
, handle(h)
{} {}
virtual std::auto_ptr<alert> clone() const virtual std::auto_ptr<alert> clone() const
{ return std::auto_ptr<alert>(new fastresume_rejected_alert(*this)); } { return std::auto_ptr<alert>(new fastresume_rejected_alert(*this)); }
torrent_handle handle;
}; };
} }