[gnome-sound-recorder] Clean up whitespace
- From: Meg Ford (Margaret) <megford src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sound-recorder] Clean up whitespace
- Date: Tue, 30 Dec 2014 04:56:21 +0000 (UTC)
commit 060d9ae40a03e73ddeb3b9a425fc8f6647b4969f
Author: Meg Ford <megford gnome org>
Date: Sun Dec 28 13:46:59 2014 -0600
Clean up whitespace
src/play.js | 124 +++++++++++++++++++++++++++---------------------------
src/waveform.js | 26 ++++++------
2 files changed, 75 insertions(+), 75 deletions(-)
---
diff --git a/src/play.js b/src/play.js
index 2c533d2..c4fe641 100644
--- a/src/play.js
+++ b/src/play.js
@@ -71,163 +71,163 @@ const Play = new Lang.Class({
startPlaying: function() {
this.baseTime = 0;
-
+
if (!this.play || this.playState == PipelineStates.STOPPED ) {
this._playPipeline();
}
-
+
if (this.playState == PipelineStates.PAUSED) {
- this.updatePosition();
- this.play.set_base_time(this.clock.get_time());
- this.baseTime = this.play.get_base_time() - this.runTime;
+ this.updatePosition();
+ this.play.set_base_time(this.clock.get_time());
+ this.baseTime = this.play.get_base_time() - this.runTime;
}
-
+
this.ret = this.play.set_state(Gst.State.PLAYING);
this.playState = PipelineStates.PLAYING;
-
+
if (this.ret == Gst.StateChangeReturn.FAILURE) {
this._showErrorDialog(_('Unable to play recording'));
errorDialogState = ErrState.ON;
- } else if (this.ret == Gst.StateChangeReturn.SUCCESS) {
- MainWindow.view.setVolume();
+ } else if (this.ret == Gst.StateChangeReturn.SUCCESS) {
+ MainWindow.view.setVolume();
}
GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, Application.SIGINT,
Application.application.onWindowDestroy, this.play);
- GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, Application.SIGTERM,
Application.application.onWindowDestroy, this.play);
+ GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, Application.SIGTERM,
Application.application.onWindowDestroy, this.play);
},
-
+
pausePlaying: function() {
this.play.set_state(Gst.State.PAUSED);
this.playState = PipelineStates.PAUSED;
-
+
if (this.timeout) {
GLib.source_remove(this.timeout);
this.timeout = null;
}
},
-
+
stopPlaying: function() {
if (this.playState != PipelineStates.STOPPED) {
this.onEnd();
}
},
-
+
onEnd: function() {
this.play.set_state(Gst.State.NULL);
this.playState = PipelineStates.STOPPED;
this.playBus.remove_signal_watch();
this._updateTime();
-
+
if (this.timeout) {
GLib.source_remove(this.timeout);
this.timeout = null;
}
-
+
if (MainWindow.wave != null)
MainWindow.wave.endDrawing();
-
+
errorDialogState = ErrState.OFF;
},
-
+
onEndOfStream: function() {
MainWindow.view.onPlayStopClicked();
},
-
+
_onMessageReceived: function(message) {
this.localMsg = message;
let msg = message.type;
switch(msg) {
-
- case Gst.MessageType.EOS:
- this.onEndOfStream();
+
+ case Gst.MessageType.EOS:
+ this.onEndOfStream();
break;
-
- case Gst.MessageType.WARNING:
+
+ case Gst.MessageType.WARNING:
let warningMessage = message.parse_warning()[0];
- log(warningMessage.toString());
+ log(warningMessage.toString());
break;
-
+
case Gst.MessageType.ERROR:
let errorMessage = message.parse_error()[0];
- this._showErrorDialog(errorMessage.toString());
- errorDialogState = ErrState.ON;
+ this._showErrorDialog(errorMessage.toString());
+ errorDialogState = ErrState.ON;
break;
-
+
case Gst.MessageType.ASYNC_DONE:
if (this.sought) {
- this.play.set_state(this._lastState);
+ this.play.set_state(this._lastState);
MainWindow.view.setProgressScaleSensitive();
- }
+ }
this.updatePosition();
- break;
-
+ break;
+
case Gst.MessageType.CLOCK_LOST:
this.pausePlaying();
break;
-
+
case Gst.MessageType.NEW_CLOCK:
if (this.playState == PipelineStates.PAUSED) {
this.clock = this.play.get_clock();
this.startPlaying();
- }
- break;
+ }
+ break;
}
- },
-
+ },
+
getPipeStates: function() {
return this.playState;
- },
-
- _updateTime: function() {
- let time = this.play.query_position(Gst.Format.TIME, null)[1]/Gst.SECOND;
+ },
+
+ _updateTime: function() {
+ let time = this.play.query_position(Gst.Format.TIME, null)[1]/Gst.SECOND;
this.trackDuration = this.play.query_duration(Gst.Format.TIME, null)[1];
- this.trackDurationSecs = this.trackDuration/Gst.SECOND;
-
+ this.trackDurationSecs = this.trackDuration/Gst.SECOND;
+
if (time >= 0 && this.playState != PipelineStates.STOPPED) {
- MainWindow.view.setLabel(time);
+ MainWindow.view.setLabel(time);
} else if (time >= 0 && this.playState == PipelineStates.STOPPED) {
- MainWindow.view.setLabel(0);
+ MainWindow.view.setLabel(0);
}
-
+
let absoluteTime = this.clock.get_time();
-
+
if (this.baseTime == 0)
this.baseTime = absoluteTime;
-
+
this.runTime = absoluteTime- this.baseTime;
let approxTime = Math.round(this.runTime/_TENTH_SEC);
-
+
if (MainWindow.wave != null) {
MainWindow.wave._drawEvent(approxTime);
}
-
+
return true;
},
-
- queryPosition: function() {
+
+ queryPosition: function() {
let position = 0;
while (position == 0) {
position = this.play.query_position(Gst.Format.TIME, null)[1]/Gst.SECOND;
}
-
+
return position;
},
-
- updatePosition: function() {
+
+ updatePosition: function() {
if (!this.timeout) {
- this.timeout = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 10, Lang.bind(this,
- this._updateTime));
+ this.timeout = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 10, Lang.bind(this,
+ this._updateTime));
}
},
-
+
setVolume: function(value) {
this.play.set_volume(GstAudio.StreamVolumeFormat.CUBIC, value);
},
-
- passSelected: function(selected) {
+
+ passSelected: function(selected) {
this._selected = selected;
this._fileToPlay = MainWindow.view.loadPlay(this._selected);
},
-
+
_showErrorDialog: function(errorStrOne, errorStrTwo) {
if (errorDialogState == ErrState.OFF) {
let errorDialog = new Gtk.MessageDialog ({ destroy_with_parent: true,
diff --git a/src/waveform.js b/src/waveform.js
index d1c923c..56f207a 100644
--- a/src/waveform.js
+++ b/src/waveform.js
@@ -50,7 +50,7 @@ const WaveForm = new Lang.Class({
_init: function(grid, file) {
this._grid = grid;
-
+
let placeHolder = -100;
for (let i = 0; i < 40; i++)
peaks.push(placeHolder);
@@ -102,7 +102,7 @@ const WaveForm = new Lang.Class({
bus.connect("message", Lang.bind(this,
function(bus, message) {
-
+
if (message != null) {
this._messageCb(message);
}
@@ -111,41 +111,41 @@ const WaveForm = new Lang.Class({
_messageCb: function(message) {
let msg = message.type;
-
+
switch(msg) {
case Gst.MessageType.ELEMENT:
let s = message.get_structure();
-
+
if (s) {
-
+
if (s.has_name("level")) {
let peaknumber = 0;
let st = s.get_value("timestamp");
let dur = s.get_value("duration");
let runTime = s.get_value("running-time");
let peakVal = s.get_value("peak");
-
+
if (peakVal) {
let val = peakVal.get_nth(0);
-
+
if (val > 0)
val = 0;
-
+
let value = Math.pow(10, val/20);
peaks.push(value);
- }
+ }
}
}
if (peaks.length == this.playTime) {
- this.pipeline.set_state(Gst.State.PAUSED);
+ this.pipeline.set_state(Gst.State.PAUSED);
}
-
+
if (peaks.length == pauseVal) {
this.pipeline.set_state(Gst.State.PAUSED);
- }
+ }
break;
-
+
case Gst.MessageType.EOS:
this.stopGeneration();
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]