Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • cali
  • dev
  • master
3 results

Target

Select target project
  • sugu/vimba
1 result
Select Git revision
  • cali
  • dev
  • master
3 results
Show changes
Commits on Source (1)
  • am0ebe's avatar
    . · d161e4ba
    am0ebe authored
    d161e4ba
......@@ -193,7 +193,6 @@ QString Cam::camInfo()
{
QString camInfo = _name + DELIM + _ip + DELIM;
camInfo += "recDur:" + formatTime( _rec->dur().count() * 1000 ) + DELIM; //XXX mv down
if( state() == Cam::disconnected )
return camInfo + "disconnected";
......@@ -217,8 +216,9 @@ QString Cam::camInfo()
camInfo += stateToString(_state);
if( _state == recording)
_rec->showProgress();
//else dur
_rec->showProgress(); //xxx string to add to camInfo
else
camInfo += "recdur:" + formatTime( _rec->dur().count() * 1000 ) + DELIM;
}
catch(const std::exception& e)
......
......@@ -113,7 +113,7 @@ void Console::printHelp()
<< "i: show info"
<< "l: list available cameras"
<< "k: deteKt cameras"
<< "y: load cam settings ("+ utils::settingsFile()+")"
<< "y: load cam settings"
<< "u: save cam settings"
<< "v: print versions"
<< "q: quit"
......