fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-06 14:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Set Content::m_chunkSize before adding files.

Browse Source 
* Removed the old FileList and replaced it with the cleaned up
EntryList code. The API now gives a FileList* instead of FileList.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@810 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2006-11-22 12:57:38 +00:00
parent e3f59ee9e4
commit 281f924556
8 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/download.cc
+2 -1
View File
@@ -42,6 +42,7 @@
#include <torrent/exceptions.h>
#include <torrent/chunk_manager.h>
#include <torrent/connection_manager.h>
#include <torrent/file_list.h>
#include <torrent/torrent.h>
#include <torrent/tracker_list.h>
@@ -164,7 +165,7 @@ Download::create_info() {
element->push_back("");
element->push_column("Memory usage:", te_value(&torrent::ChunkManager::memory_usage, value_base::flag_mb), " MB");
element->push_column("Max memory usage:", te_value(&torrent::ChunkManager::max_memory_usage, value_base::flag_mb), " MB");
element->push_column("Free diskspace:", te_value(&torrent::Download::free_diskspace, value_base::flag_mb), " MB");
element->push_column("Free diskspace:", te_value(&torrent::FileList::free_diskspace, value_base::flag_mb), " MB");
element->push_column("Safe diskspace:", te_value(&torrent::ChunkManager::safe_free_diskspace, value_base::flag_mb), " MB");
element->push_back("");
src/ui/element_file_list.cc
+19 -18
View File
@@ -106,7 +106,7 @@ ElementFileList::receive_next() {
if (m_window == NULL)
throw torrent::client_error("ui::ElementFileList::receive_next(...) called on a disabled object");
if (++m_focus >= m_download->download()->file_list().size())
if (++m_focus >= m_download->download()->file_list()->size_files())
m_focus = 0;
m_window->mark_dirty();
@@ -117,15 +117,15 @@ ElementFileList::receive_prev() {
if (m_window == NULL)
throw torrent::client_error("ui::ElementFileList::receive_prev(...) called on a disabled object");
torrent::FileList fl = m_download->download()->file_list();
torrent::FileList* fl = m_download->download()->file_list();
if (fl.size() == 0)
if (fl->size_files() == 0)
return;
if (m_focus != 0)
--m_focus;
else
m_focus = fl.size() - 1;
m_focus = fl->size_files() - 1;
m_window->mark_dirty();
}
@@ -136,13 +136,14 @@ ElementFileList::receive_pagenext() {
throw torrent::client_error("ui::ElementFileList::receive_pagenext(...) called on a disabled object");
unsigned int count = (m_window->height() - 1) / 2;
torrent::FileList* fl = m_download->download()->file_list();
if (m_focus + count < m_download->download()->file_list().size())
if (m_focus + count < fl->size_files())
m_focus += count;
else if (m_focus == m_download->download()->file_list().size() - 1)
else if (m_focus == fl->size_files() - 1)
m_focus = 0;
else
m_focus = m_download->download()->file_list().size() - 1;
m_focus = fl->size_files() - 1;
m_window->mark_dirty();
}
@@ -152,9 +153,9 @@ ElementFileList::receive_pageprev() {
if (m_window == NULL)
throw torrent::client_error("ui::ElementFileList::receive_pageprev(...) called on a disabled object");
torrent::FileList fl = m_download->download()->file_list();
torrent::FileList* fl = m_download->download()->file_list();
if (fl.size() == 0)
if (fl->size_files() == 0)
return;
unsigned int count = (m_window->height() - 1) / 2;
@@ -162,7 +163,7 @@ ElementFileList::receive_pageprev() {
if (m_focus > count)
m_focus -= count;
else if (m_focus == 0)
m_focus = fl.size() - 1;
m_focus = fl->size_files() - 1;
else
m_focus = 0;
@@ -174,12 +175,12 @@ ElementFileList::receive_priority() {
if (m_window == NULL)
throw torrent::client_error("ui::ElementFileList::receive_prev(...) called on a disabled object");
torrent::FileList fl = m_download->download()->file_list();
torrent::FileList* fl = m_download->download()->file_list();
if (m_focus >= fl.size())
if (m_focus >= fl->size_files())
return;
torrent::File* file = fl.get(m_focus);
torrent::File* file = fl->at_index(m_focus);
file->set_priority(next_priority(file->priority()));
@@ -192,15 +193,15 @@ ElementFileList::receive_change_all() {
if (m_window == NULL)
throw torrent::client_error("ui::ElementFileList::receive_prev(...) called on a disabled object");
torrent::FileList fl = m_download->download()->file_list();
torrent::FileList* fl = m_download->download()->file_list();
if (m_focus >= fl.size())
if (m_focus >= fl->size_files())
return;
Priority p = next_priority(fl.get(m_focus)->priority());
Priority p = next_priority(fl->at_index(m_focus)->priority());
for (int i = 0, last = fl.size(); i != last; ++i)
fl.get(i)->set_priority(p);
for (int i = 0, last = fl->size_files(); i != last; ++i)
fl->at_index(i)->set_priority(p);
m_download->download()->update_priorities();
m_window->mark_dirty();