X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fclip_list.cpp;h=c586b1a93dcd719db43e79221a24324d1fd74533;hb=1a9150fd8435914eec35a0dbdff3a9a2266d9e97;hp=b456c75ca77ee4ee2a3beb029b6b62d5ada8275b;hpb=f018e574d22638e49e9d01caafcfdb9cec173d32;p=nageru diff --git a/futatabi/clip_list.cpp b/futatabi/clip_list.cpp index b456c75..c586b1a 100644 --- a/futatabi/clip_list.cpp +++ b/futatabi/clip_list.cpp @@ -220,7 +220,7 @@ QVariant ClipList::headerData(int section, Qt::Orientation orientation, int role case Column::DURATION: return "Duration"; default: - if (section >= int(Column::CAMERA_1) && section < int(Column::CAMERA_1) + num_cameras) { + if (is_camera_column(section)) { return QString::fromStdString("Camera " + to_string(section - int(Column::CAMERA_1) + 1)); } else { return ""; @@ -329,7 +329,7 @@ bool PlayList::setData(const QModelIndex &index, const QVariant &value, int role case Column::CAMERA: { bool ok; int camera_idx = value.toInt(&ok); - if (!ok || camera_idx < 1 || camera_idx > num_cameras) { + if (!ok || camera_idx < 1 || camera_idx > int(num_cameras)) { return false; } clips[row].stream_idx = camera_idx - 1;