diff --git a/configure.ac b/configure.ac index 1d7fe457..9faaa034 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(rtorrent, 0.5.3, jaris@ifi.uio.no) +AC_INIT(rtorrent, 0.6.0, jaris@ifi.uio.no) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) @@ -23,7 +23,7 @@ TORRENT_WITHOUT_NCURSESW() TORRENT_WITHOUT_STATVFS() TORRENT_WITHOUT_STATFS() -PKG_CHECK_MODULES(STUFF, sigc++-2.0 libtorrent >= 0.9.0, +PKG_CHECK_MODULES(STUFF, sigc++-2.0 libtorrent >= 0.10.0, CXXFLAGS="$CXXFLAGS $STUFF_CFLAGS $CURL_CFLAGS"; LIBS="$LIBS $STUFF_LIBS $CURL_LIBS") diff --git a/src/display/window_file_list.cc b/src/display/window_file_list.cc index 1cb17eb3..a7dbf9c8 100644 --- a/src/display/window_file_list.cc +++ b/src/display/window_file_list.cc @@ -110,15 +110,15 @@ WindowFileList::redraw() { std::string priority; switch (e.priority()) { - case torrent::File::OFF: + case torrent::PRIORITY_OFF: priority = "off"; break; - case torrent::File::NORMAL: + case torrent::PRIORITY_NORMAL: priority = " "; break; - case torrent::File::HIGH: + case torrent::PRIORITY_HIGH: priority = "hig"; break; @@ -128,18 +128,18 @@ WindowFileList::redraw() { }; m_canvas->print(0, pos, "%c %s %6.1f %s %3d %9s", - range.first == *m_focus ? '*' : ' ', - path.c_str(), - (double)e.size_bytes() / (double)(1 << 20), - priority.c_str(), - done_percentage(e), - e.path()->encoding().c_str()); + range.first == *m_focus ? '*' : ' ', + path.c_str(), + (double)e.size_bytes() / (double)(1 << 20), + priority.c_str(), + done_percentage(e), + e.path()->encoding().c_str()); m_canvas->print(84, pos, "%i - %i %c%c", - e.chunk_begin(), - e.chunk_begin() != e.chunk_end() ? (e.chunk_end() - 1) : e.chunk_end(), - e.is_created() ? 'E' : 'M', - e.is_correct_size() ? 'C' : 'W'); + e.chunk_begin(), + e.chunk_begin() != e.chunk_end() ? (e.chunk_end() - 1) : e.chunk_end(), + e.is_created() ? 'E' : 'M', + e.is_correct_size() ? 'C' : 'W'); ++range.first; ++pos; diff --git a/src/ui/element_file_list.cc b/src/ui/element_file_list.cc index 1735fd97..e0ca5181 100644 --- a/src/ui/element_file_list.cc +++ b/src/ui/element_file_list.cc @@ -150,17 +150,17 @@ ElementFileList::next_priority(Priority p) { // Ahh... do +1 modulo. switch(p) { - case torrent::File::OFF: - return torrent::File::HIGH; + case torrent::PRIORITY_OFF: + return torrent::PRIORITY_HIGH; - case torrent::File::NORMAL: - return torrent::File::OFF; + case torrent::PRIORITY_NORMAL: + return torrent::PRIORITY_OFF; - case torrent::File::HIGH: - return torrent::File::NORMAL; - + case torrent::PRIORITY_HIGH: + return torrent::PRIORITY_NORMAL; + default: - return torrent::File::NORMAL; + return torrent::PRIORITY_NORMAL; }; } diff --git a/src/ui/element_file_list.h b/src/ui/element_file_list.h index f28c94cc..70bc130a 100644 --- a/src/ui/element_file_list.h +++ b/src/ui/element_file_list.h @@ -53,7 +53,7 @@ namespace ui { class ElementFileList : public ElementBase { public: - typedef torrent::File::Priority Priority; + typedef torrent::priority_t Priority; typedef display::WindowFileList WFileList; ElementFileList(core::Download* d);