eibox/plugins/records.py public/img/list-remove.png public/img/media-playback-start.png public/img/media-playback-stop.png public/img/process-stop.png @@ -11,7 +11,8 @@ from PyQt4 import QtCore, QtGui class EiboxSlider(QtGui.QSlider): def __init__(self, orientation = None, parent = None): + orientation = QtCore.Qt.Orientation(orientation) if parent == None: QtGui.QSlider.__init__(self, orientation) else: - QtGui.QSlider.__init__(self, orientation, parent) \ No newline at end of file + QtGui.QSlider.__init__(self, orientation, parent) eibox/EiboxGui/EiboxSlider.py @@ -56,13 +56,13 @@ // TODO : Remover as setas quando o contéudo for menor if (data.up != null && self.position >= 0) { - $(data.up).css({ opacity: '0.2'}); + $(data.up).css({ opacity: '0'}); } else { $(data.up).css({ opacity: '1.0'}); } if (data.down != null && self.position <= self.max) { - $(data.down).css({ opacity: '0.2'}); + $(data.down).css({ opacity: '0'}); } else { $(data.down).css({ opacity: '1.0'}); } eibox/js/jquery/jquery.touchscroll.js @@ -22,10 +22,10 @@ gst.StateChangeReturn.__str__ = _gst_state__str__ class Player(QtCore.QThread): pipeline = None; - playbin = gst.element_factory_make('playbin') + playbin = None; _state = None; - _mutex = QtCore.QMutex() + _mutex = None; _duration = None; __pyqtSignals__ = ( @@ -37,12 +37,13 @@ class Player(QtCore.QThread): 'error(int, QString)' ) - def __init__(self, parent): + def __init__(self, name, parent = None): QtCore.QThread.__init__(self, parent) - self.pipeline = gst.Pipeline('podmobile') + self.playbin = gst.element_factory_make('playbin') + self.pipeline = gst.Pipeline(name) self.pipeline.add(self.playbin) self._state = self.pipeline.get_state()[1] - + self._mutex = QtCore.QMutex() self.start() def lock(self): eibox/plugins/player.py @@ -90,6 +90,12 @@ class EiboxWindow(QtGui.QMainWindow): msg = msg.toAscii() eval("logging.%s(msg)" % str(type)) + @QtCore.pyqtSignature("QString") + def remove_file(self, file): + file = str(file) + if (os.path.exists(file)): + os.remove(file) + @QtCore.pyqtSignature("QString", result = "QString") def plugin(self, params): params = cjson.decode(str(params.toUtf8())) eibox/window.py @@ -117,9 +117,12 @@ body.pc { max-width: 317px; } -#content .numerable { +.numerable { font-size: 1em; color: #42515B; +} + +#content .numerable { width: 60px; } @@ -245,13 +248,26 @@ background: transparent url(../img/icons/podcasts.png) no-repeat 15px; width: 340px; height: 100%; float: left; + background: transparent url(../img/m.png) no-repeat center; +} + +#left .painel { + visibility: hidden; +} + +#left.showplayer { + background-image: none; +} + +#left.showplayer .painel { + visibility: visible; } /* PLayer */ #player { height: 160px; - margin-bottom: 5px; padding-top: 5px; + margin-bottom: 5px; } #player #thumb { @@ -360,7 +376,12 @@ background: transparent url(../img/icons/podcasts.png) no-repeat 15px; text-align: center; } +#commentslist { + clear: both; +} + #lcomments .scrollable { + clear: both; max-height: 194px; overflow: hidden; margin: 2px 0; @@ -379,18 +400,43 @@ background: transparent url(../img/icons/podcasts.png) no-repeat 15px; } #lcomments ul li { + font-size: 14pt; width: 100%; - height: 59px; + height: 28px; border-bottom: solid 1px #FFF; background-color: #7993a3; clear: both; + text-align: left; + padding: 5px 5px 0 5px; } +#lcomments ul li a { + margin: -5px 10px 0 0; + float: right; + display: block; + width: 32px; + height: 32px; +} + +#lcomments ul li .play { + background: transparent url(../img/media-playback-start.png) no-repeat center; +} + +#lcomments ul li .remove { + background: transparent url(../img/list-remove.png) no-repeat center; +} + +/* +#lcomments ul li label { + margin-left: 5px; +}*/ + #lcomments ul li.select { background-color: #B37638 } #lcomments h1 { + float: left; margin: 2px 0 0 5px; height: 21px; line-height: 21px; @@ -401,6 +447,15 @@ background: transparent url(../img/icons/podcasts.png) no-repeat 15px; width: 100px; } +#lcomments h2 { + float: right; + margin: 6px 10px 0 0; +} + +.up .dowm { + opacity: 0.0; +} + /* Dialogs */ #dialogs div { display: none; @@ -445,6 +500,3 @@ background: transparent url(../img/icons/podcasts.png) no-repeat 15px; left: 0; } -.init_hide { - visibility: hidden; -} public/css/style.css @@ -99,23 +99,24 @@ function podMobile($) { // List self.divs.list.find('li').live('click', self.item_click); + self.divs.lcomments.find('li').live('click', self.comment_click); $('#list > .scrollable').touchscroll({ up : '#list .up', down : "#list .down" }); - $('#lcomments > .scrollable').touchscroll({ + $('#lcomments .scrollable').touchscroll({ up : '#lcomments .up', down : "#lcomments .down" }); self.loadList(); - //self.init_player(); + self.init_player(); // Hidde splash - $('.init_hide').css('visibility', 'visible'); - //$('#loading').fadeOut(1000); + //$('.init_hide').css('visibility', 'visible'); + $('#loading').fadeOut(1000); } //------------------------------------------------------------- @@ -177,10 +178,12 @@ function podMobile($) { case('play'): if (data.cast.download == "download" && data.cast.local != null) { self.current_player = { + podcast_id : data.podcast.id, podcast : data.padcast, cast : data.cast, podcast_line : data.podcast_line, - cast_line : list + cast_line : list, + cont : false, }; self.divs.player.find('h1').html(data.podcast.title); @@ -188,6 +191,8 @@ function podMobile($) { self.divs.thumb.attr('src', data.podcast.img); self.player.setCurrentSource(data.cast.local); } + self.load_comments(); + self.show_play(); self.player.play(); self.reloadCurrentContent(); return; @@ -502,11 +507,70 @@ function podMobile($) { return "%s%s%s%s%s".sprintf(d[0], d[1], d[2], d[3], d[4]); } + self.show_play = function() { + $('#left').addClass('showplayer'); + } + + self.comment_click = function(event) { + if (event.toElement.nodeName == "A") { + var data = $(this).data('comment'); + var link = $(event.toElement); + if (link.hasClass('play')) { + if (self.player.state() == 'GST_STATE_PLAYING') { + self.player.pause(); + self.current_player.cont = true; + } + + if (self.player2.state() == 'GST_STATE_PLAYING') { + link.css("background-image", "url(img/media-playback-start.png)"); + self.player2.stop(); + if (self.current_player.cont) { + self.player.play(); + } + self.current_player.cont = false; + } else { + link.css("background-image", "url(img/media-playback-stop.png)") + Eibox.logging.debug(data.file); + self.player2.setCurrentSource(data.file); + self.player2.start(); + self.player2.finished.connect(function() { + link.css("background-image", "url(img/media-playback-start.png)"); + self.player2.stop(); + if (self.current_player.cont) { + self.player.play(); + } + self.current_player.cont = false; + }); + } + } else if(link.hasClass('remove')) { + data.destroy(); + self.load_comments(); + } + } + } + + self.load_comments = function() { + if (!Eibox.empty(self.current_player)) { + var list = self.divs.lcomments.find('ul'); + list.html(""); + comments = Comment.find({ conditions : 'cast_id = ' + self.current_player.cast.id }); + self.divs.lcomments.find('h2').html(comments.length); + $(comments).each(function() { + var label = (convertTime(this.position) + ' - ' + convertTime(this.duration)) + var item = $('<li><label>' + label + '</label><a class="remove" href="#"/></a><a class="play" href="#"/></a></li>'); + list.append(item); + item.data('comment', this); + }); + } + }; + /** * Initialize player */ self.init_player = function() { - self.player = Eibox.plugin("Player"); + self.player = Eibox.plugin("Player", "player"); + self.player2 = Eibox.plugin("Player", "comment"); + self.records = Eibox.plugin("Records"); //self.player.start(); // Slider @@ -522,6 +586,38 @@ function podMobile($) { (self.player.state() == 'GST_STATE_PLAYING') ? self.player.pause() : self.player.play(); }); + self.records.finished.connect(function(duration, position, file, cont) { + var c = Comment.create({ + cast_id : self.current_player.cast.id, + duration : duration, + position : position, + file : file + }); + if (cont) + self.player.play(); + + self.load_comments(); + }); + + // Comments + $('#bt_comment').click(function() { + if (!Eibox.empty(self.current_player)) { + if (self.records.state == 'NULL') { + var playing = false; + if (self.player.state() == 'GST_STATE_PLAYING') { + self.player.pause(); + playing = true; + } + var file = self.info.home_dir + self.current_player.podcast_id + '/comment_' + ((new Date()).getTime()) + '.ogg' + self.records.record(file, slider.value, playing); + $(this).css("background-image", "url(img/bt_stop.png)"); + } else { + self.records.stop(); + $(this).css("background-image", "url(img/bt_comment.png)"); + } + } + }); + self.player.totalTimeChanged.connect(function(duration) { slider.value = 0; setDurationBox(0, duration); public/js/main.js @@ -116,3 +116,21 @@ var Cast = new JazzRecord.Model({ } } }); + +var Comment = new JazzRecord.Model({ + table: "comments", + //belongsTo: { cast: "casts"}, + columns: { + cast_id : "number", + duration : "number", + position : "number", + file : "text" + }, + + events: { + onDestroy: function() { + application.remove_file(this.file); + //Eibox.pyEval('if (os.path.exists("' + this.file + '")): os.remove(self.saveFileName)'); + } + } +}); public/js/models.js @@ -42,37 +42,47 @@ </div> <div id="left"> <div id="player" class="painel"> - <img id="thumb" src="img/default.png" /> - <h1>Podmobile</h1> - <h2></h2> - <a id="volume" href="#"></a> - <div id="controller"> - <a id="bt_player" href="#"></a> - <a id="bt_comment" href="#"></a> - <a id="bt_back" href="#"></a> - <a id="duration" href="#">Not load</a> - <a id="bt_forward" href="#"></a> - </div> - <div id="progress"> - <div class="slider init_hide"> - <object type="application/x-qt-plugin" classid="EiboxGui.EiboxSlider" name="slider" height="15" width="220"> - <param name="init" value="1, parent" /> - </object> + <div id="playercontent"> + <img id="thumb" src="img/default.png" /> + <h1>Podmobile</h1> + <h2></h2> +  + <div id="controller"> + <a id="bt_player" href="#"></a> + <a id="bt_comment" href="#"></a> + <a id="bt_back" href="#"></a> + <a id="duration" href="#">Not load</a> + <a id="bt_forward" href="#"></a> + </div> + <div id="progress"> + <div class="slider init_hide"> + <object type="application/x-qt-plugin" classid="EiboxGui.EiboxSlider" name="slider" height="15" width="220"> + <param name="init" value="1, parent" /> + </object> + </div> </div> </div> </div> <div id="lcomments" class="painel"> <h1>Comments</h1> - <img class="up" src="img/arrow_up.png" /> - <div class="scrollable"> - <ul> - <li>Item 1</li> - <li>Item 1</li> - <li>Item 1</li> - <li>Item 1</li> - </ul> + <h2 class="numerable">0</h2> + <div id="commentslist"> + <img class="up" src="img/arrow_up.png" /> + <div class="scrollable"> + <ul> +  + </ul> + </div> + <img class="down" src="img/arrow_down.png" /> </div> - <img class="down" src="img/arrow_down.png" /> </div> </div> </div> @@ -85,9 +95,7 @@ </div> <h2 id="msg"></h2> </div> -  </body> </html> public/main.html 1172f183dd389a83da72b856c8e8b5e860220aff Everton Ribeiro nuxlli@gmail.com http://github.com/nuxlli/podmobile/commit/eae529a724a31b95f73d54a7033b241962e0ccff eae529a724a31b95f73d54a7033b241962e0ccff

2009-02-12T02:42:04-08:00

Suporte a gravação de audio 001efd4e1abe7af43e6a309c81dab51ff9cb83f9 Everton Ribeiro nuxlli@gmail.com