Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mediamonitor2' of dev.sourcefabric.org:airtime into mediamonitor2

This commit is contained in:
Rudi Grinberg 2012-07-16 14:58:34 -04:00
parent a9f6bb3b5c 312f35ae48
commit 723e6356bc
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/controllers/ApiController.php
View File

@ -958,8 +958,6 @@ class ApiController extends Zend_Controller_Action
public function updateReplayGainValueAction()
{
$this->checkAuth();
// disable layout
$this->view->layout()->disableLayout();
$this->_helper->viewRenderer->setNoRender(true);
@ -971,7 +969,7 @@ class ApiController extends Zend_Controller_Action
list($id, $gain) = $pair;
$file = Application_Model_StoredFile::Recall($p_id = $id)->getPropelOrm();
Logging::log("Setting $gain for file id $id");
Logging::debug("Setting $gain for file id $id");
$file->setDbReplayGain($gain);
$file->save();
}

2
airtime_mvc/application/models/airtime/map/CcFilesTableMap.php
View File

@ -101,7 +101,7 @@ class CcFilesTableMap extends TableMap {
$this->addColumn('SOUNDCLOUD_ERROR_MSG', 'DbSoundcloudErrorMsg', 'VARCHAR', false, 512, null);
$this->addColumn('SOUNDCLOUD_LINK_TO_FILE', 'DbSoundcloudLinkToFile', 'VARCHAR', false, 4096, null);
$this->addColumn('SOUNDCLOUD_UPLOAD_TIME', 'DbSoundCloundUploadTime', 'TIMESTAMP', false, 6, null);
$this->addColumn('REPLAY_GAIN', 'DbReplayGain', 'VARCHAR', false, 16, '0');
$this->addColumn('REPLAY_GAIN', 'DbReplayGain', 'VARCHAR', false, 16, null);
// validators
} // initialize()

8
airtime_mvc/application/models/airtime/om/BaseCcFiles.php
View File

@ -412,7 +412,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
/**
* The value for the replay_gain field.
* Note: this column has a database default value of: '0'
* @var string
*/
protected $replay_gain;
@ -472,7 +471,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
$this->currentlyaccessing = 0;
$this->length = '00:00:00';
$this->file_exists = true;
$this->replay_gain = '0';
}
/**
@ -2613,7 +2611,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->replay_gain !== $v || $this->isNew()) {
if ($this->replay_gain !== $v) {
$this->replay_gain = $v;
$this->modifiedColumns[] = CcFilesPeer::REPLAY_GAIN;
}
@ -2663,10 +2661,6 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
return false;
}
if ($this->replay_gain !== '0') {
return false;
}
// otherwise, everything was equal, so return TRUE
return true;
} // hasOnlyDefaultValues()

2
airtime_mvc/build/sql/schema.sql
View File

@ -124,7 +124,7 @@ CREATE TABLE "cc_files"
"soundcloud_error_msg" VARCHAR(512),
"soundcloud_link_to_file" VARCHAR(4096),
"soundcloud_upload_time" TIMESTAMP(6),
"replay_gain" VARCHAR(16) default '0',
"replay_gain" VARCHAR(16),
PRIMARY KEY ("id"),
CONSTRAINT "cc_files_gunid_idx" UNIQUE ("gunid")
);